Merge branch 'fixbug0109'