Merge branch 'jk/maint-break-rename-reduce-memory' into maint