1. Yes
2. The change to Message.cpp should fix this, no?