Update PostEdit to master

Change-Id: I8b5924df36b10731609973ddbfeeb6a2cf51c5b9