2.3.16 security upgrade - 2