Migrated for placement for 1.7.10 source code