For 3.2.6 release