Updates for v2.1 - see changelog for details