Saftey commit while integrating browser and server code with new engagement features.