Merge branch 'js/name-rev-fix'