Merge branch 'bug/JAL-1604_Entire-alignment-submission' into develop