Merging updates. BRANCH LOCK IN PLACE.