Merging 7.x-1.x improvements into 7.x-2.x branch.