Massimiliano Ziccardi started work on Bug AGPUSH-2208