Massimiliano Ziccardi started work on Sub-task AGDROID-691