merge changes from Jason Venkiteswaran

Changes from v2.1.1 to v2.1.2