Merge branch 'issue_469' into 'master'

Issue 469

See merge request !479
4 jobs for 2.3.11 in 11 minutes and 34 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #160139
Lint

00:01:36

passed #160140
Test

00:03:03

 
  Build
passed #160141
Build and publish

00:05:09

 
  Deploy
passed #160142
manual
Deploy

00:01:45