Merge branch 'js/refs' into next