Merge 2.0.5 release

Merge 2.0.5 release contents into master.