Matthias Wessendorf started work on Feature Request AGPUSH-687