Merge from open-source master