Brought in changes to js files and settings.html from latest prod commit