Merge branch 'js/retire-relink'