Merge branch 'js/maint-diff-temp-smudge' into maint