Merge branch 'JAL-1312_ambiguity_na' into develop