Merge: change order of properties when raising a server event

Signed-off-by: Bryan <mattheyan@gmail.com>