branch 16.0 updates for mac_g4 with fixes for others