JBCTS-1315 - updates for compliance