Merge branches 'fix-pr11898' and 'fix-pr-11893-and-10766' into maint