Issue #2328803: fixed issue where choice_penalty is not saved
Issue #2328803: Matching needs tests