Merge branch 'develop' into features/JAL-2909_bamImport_2_11_2