Additional build updates pertaining to leveraging FHV/DeveloperTools