Merge "Changed management to just show all controls" into rvc-dev