Bruno Oliveira updated Feature Request AGPUSH-1288