Merge fixes to GAF4