Merge "Fix some heights" into rvc-dev