Merge branch 'issue_171' into 'master'

It fixes #171

Closes #171

See merge request !153
2 jobs for 1.12.1 in 6 minutes and 34 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #37164
build

00:02:14

 
  Deploy
passed #37165
allowed to fail manual
deploy

00:04:19