Initial commit for 7.x-2.x branch