JAL-4036 Changes made from code review CR-JAL-265