#331 #332 #346 Miscellaneous
Merge branch 'version2.0' into version2.1