Merge branch 'main' into dev-joao-pdf_generator
PedroLopesUPE authored
6b39fce8