Merge branch 'js/eol-on-ourselves'