Merge local work in 7.x-1.x branch