Daniel Passos started work on Bug AGPUSH-1094