Merge branch 'fix-317805' into 'master'

Fix for #317805

Closes #317805

See merge request !90
1 job for master in 5 minutes and 41 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed build #1377

00:05:41