Added TODO for upcoming release 2.2.