Merge branch 'js/compat-mkdir'