Merge branch 'develop' into merge/develop_bug/JAL-2154projectMappings