Merge branch 'js/unmap-before-ext-diff' into maint