Merge branch 'hotfix-6.0.2'
porting fix for #191
Merge branch 'hotfix-6.0.3' into develop