Merge "CDD: Changes related to Scoped Storage" into rvc-dev