Daniel Passos started work on Enhancement AGDROID-797