Manual merge changes from xbuild-install-1 branch