Master Build Patches for PZOSP