fix merge conflicts for finess on JAL-1140 (introduced by 1a8f953dd71a9e319e910261927...