Updates for 2.10