Merge branch 'js/t1050'