Merge branch 'issue-446-v2' into 'master'

Fix crispy forms error

Close #446 

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

passed selenium