Bruno Oliveira updated Enhancement AGPUSH-1072