Promoting to 2.6.4