Merge "Use compat flags to reflect the current status of legacy storage." into rvc-dev