Erik Jan de Wit stopped work on Sub-task AGPUSH-629