Merge branch '3890_syntax_mjs'