Merge branch 'sp/missing-thin-base' into maint