merged change from xmpp branch