Merge registration messages together where possible to avoid sending multiple to the same recipient. Issue: #560
Merge branch 'develop' into testing