Manual merge from local walktrough 02.