Massimiliano Ziccardi updated Sub-task AGDROID-691