Update changes for 3.09 patch