Merge branch 'JAL-976_jabaws2supp' into develop