merge poker into update-1