Merge branch 'javascript_interactive'