Merge branch 'features/JAL-1541_BioJsMSA' into develop