Merge branch 'issue-448' into 'master'

Request fixes

Closes #448

See merge request !370
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud

passed selenium