Merged changes from v2.0001