Merge branch 'js/xmerge-marker-eol'