Fixed ID13456
Merge branch 'hotfix-0.7.1' into develop