Merging upstream changes from March 5th, fixing merge issues.