Bruno Oliveira updated Enhancement AGPUSH-883