Merge "SF: Remove a redundant write" into rvc-dev