Erik Jan de Wit updated Enhancement AGPUSH-839