final merge for merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950