Sebastien Blanc updated Enhancement AGPUSH-945