Version updated to v2.21