Merge branch 'js/detach-doc' into next