Merge 12735:15568 from xmlbuildsystem branch