OZP-798: Moving security code to security bundle