Fix raise invocation
Merge branch 'master' into ha-feature-template_group_selection