Merge branch 'issue#14' into 'dev-v2.8.1'

Mirror of !13 for v2.8.1

See merge request !71
1 job for v2.8.1
in 0 seconds, using 0 compute credits, and was queued for 22 seconds