Merge branch 'fixes-base' into fixes