Cb-7904: Pull request for nightlys

may also want to do a "git clean -d -f"