automerge: 16e4324
* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
Fix issue #18827122: system server crashed on broadcasting...
automerge: 16e4324
* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
Fix issue #18827122: system server crashed on broadcasting...