RoomMapper SQL statements fixed.
Merge origin/master