updates based on AGPUSH-262