Merge "Change the way how we call setStorageParams." into rvc-dev