Bruno Oliveira started work on Feature Request AGSEC-181