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