Merge "Fix SecurityControllerTest" into rvc-dev