Merge in 4.5.500 changes