fix problems revealed by QA task.
Merge origin/master
fix problems revealed by QA task.