[SD-225]/[SD-166] - Ticket add-ons

Orestis Athanasopoulos Antoniourequested to merge
fix/sd-225-sd-166-ticket-addons into main

Closes SD-225 Closes SD-166

Edited by Orestis Athanasopoulos Antoniou

Merge request reports