Merge "Try to reland Ib3ee007bc" into rvc-dev