Merge from 6.6-stable