Merge branch 'js/hp-nonstop'