Sync 7.x-2.x branch with work done in stable 7.x-1.x