Merge branch 'hotfix/hotfixfea' into develop
add comment
Merge branch 'develop'

thmergee commit.