Update #2.1 

More commits to be added.

DO NOT MERGE.