I think it would be better to do this after 2.3 is released for 2.4.