jichenjc: Backport changes from master to release-0.1

No Results