Merge branch 'js/attach'