Merge "Throw the SecurityException only on V+ builds." into main