Flag fixes
Fix conflicts
Merge branch 'dev' of https://github.com/GeographicaGS/elcano-iepg into dev