JAL-3608 Changes from code review CR-JAL-236