Replace JSON module; Updater for submodules
auto-merge staging into master