update best_in_place to branch master