Merged from build-system branch.