Daniel Passos started work on Bug AGDROID-799