Merge branch 'develop' into 'master'

2.6.0 release merge

See merge request diasporg/Poduptime!236
2 jobs for master
Status Job ID Name Coverage
  Test
failed #2723
test:7.2

failed #2724
test:7.3

 
Name Stage Failure
failed
test:7.2 Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
test:7.3 Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log