Merge branch 'feature/Calculos' into develop

1 job for master in 1 minute and 30 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed sonarcloud-check #34848

00:01:30