Merge "Restore legacy SecurityException behavior" into rvc-dev