Merge "Restore missing line" into rvc-dev