Daniel Passos started work on Feature Request AGDROID-585