Merge branch 'features/mchmmer' into features/mchmmer_merge_JAL-1950