Fix copy & paste error
Merge branch 'develop' into feature/issue-32-set-accept-msg
Merge branch 'feature/issue-32-set-accept-msg' into develop