Commit beae8ee8 authored by klafyvel's avatar klafyvel

Merge branch 'dev' into '2.7'

Dev

See merge request !398
parents 201b87f3 4f9e0f8a
Pipeline #1782 passed with stage
in 5 minutes and 28 seconds