Built wgaf from 531590e on branch master