Merge branch 'km/avoid-non-function-return-in-rebase' into maint