Unlogged changes made by PepperPD team.