Christos Vasilakis updated Sub-task AGPUSH-609