Merge "Add disable_configstore" into rvc-dev