Merge branch 'js/config' into pu