Merge "Controls management Minor polish changes" into rvc-dev