Merge branch 'master' into js/merge-base