Update to MacGap1 at df9455ca362aadb067f271b318e509fa8d8f321f