Changes from 6.6.a3 branch integrated