Missing commits from 6.5 to 6.6 branch