Gaf 4 merge gaf 3 (additional merge)