Merge branch anton with master for v2.0.