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

2.7.1 maintenance into 2.8.1 dev

See merge request !16