Merge branch 'issue78' into 'master'

It fixes #78.

Closes #78

See merge request !98
3 jobs for 1.10.17 in 41 seconds
Status Job ID Name Coverage
  Build
passed #52276
build

00:00:22

 
  Deploy
passed #52294
allowed to fail manual
deploy_production

00:00:18

failed #52277
allowed to fail manual
deploy_production

00:01:09