Merge from local 7.x-1.x