status changes 2
merge android-chat-only > iss299