Merge "Add more information to removed controls" into rvc-dev