This pull request refers to AGPUSH-1080

It must go on master and 1.0.x