Merge branch 'ag/maint-combine-diff-fix' into maint