Better solution for #391
Merge branch 'XMPP-FTW' into dev