Merge branch 'js/config-cb'