merge in locations changes to accelerator branch