Merge pull request #3238 from Zuhayr/feature

Fixes from master/bef for staging.
Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed.
Merge pull request #3244 from Ispil/Staging

Fixes issue #3240. The order for visible_message is visible, person, aud...
Merge pull request #3245 from Zuhayr/feature

SkyMarshal's ZAS fixes from bef.
Partial fix for #3087