[Module Tag script: ucp 12.0.0beta17]
Merge branch 'develop' into release/12.0
[Module Tag script: ucp 12.0.0beta18]
prevent message stacking by using a message buffer