CFY-959 work for quickbuild integration