Pulling in update to 2.3.4