Merge branch 'JAL-1312_ambiguity_na' into Release_2_8_Branch