Merge branch 'js/refs'