Merging 4.5.x changes

Merging changes necessary for 4.5.x build