CAAERS-6295, changed security handling.