Merge "Fix controls management activities details" into rvc-dev