Merge branch 'hotfix/msell-issue-5' into develop