Merge "More setStorageParams improvements." into rvc-dev