Merge branch 'JAL-1755_npe_groupconsensus' into develop