JAL-1338 note added #fridaycommits not actually connected with JAL-1138