Bruno Oliveira updated Enhancement AGPUSH-843