Merge "Add OPSTR_NO_ISOLATED_STORAGE" into rvc-dev