Lukáš Fryč updated Sub-task AGPUSH-656