Merge "Stop requantizing complex derived sensors" into rvc-dev