Merge branch 'feature/291-automatic-pws-document'
Fix wrong variable name. Result of badly merge.
Merge branch 'hotfix-1.1.1' into develop