Merges from release 6.6.a1