Multiple improvement for 2.1 release.