CLO-588 fresh build for initial testing