Merge branch 'js/name-rev-use-oldest-ref' into maint