hotfix3 done
Merge branch 'hotfix3'