Cb-7904: Pull request for nightlys