- fix bugs (reverse-merged from commit b79fb500d58edfe630d707dd052f4492312cb17f)
Merge remote-tracking branch 'origin/master'