reverting agent.pp to master version for merge