Port to 1.7.10

Have scaffolds been tested in MP?