Merge branch 'js/remoteconfig'