Merge in 6.5.5