2100 migrate extras

#2100 repatched migrate_extras and updated make file.