Merge branch 'js/show'