Production changes before local search merge