Updates for 2.6 and other improvements