2797 Branch : 3.6.4.PTF