"master" and "main" related fixes

Pablo Correa Gomezrequested to merge
main-fixes into main

See each commit

Edited by Pablo Correa Gomez

Merge request reports