Lukáš Fryč started work on Feature Request AGPUSH-1349