Merge branch '2.7.1-maintenance' into '2.8.1-dev'

2.7.1 maintenance into 2.8.1 dev

See merge request !16
1 job for 2.8.1-dev in 0 seconds (queued for 6 minutes and 5 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:08:43