Merge branch 'js/xmerge-marker-eol' into maint