Merge branch 'working-branch-nadia' of https://earth.bsc.es/gitlab/es/sunset...

Merge branch 'working-branch-nadia' of https://earth.bsc.es/gitlab/es/sunset into working-branch-nadia