CFY-1419 build changes