add ctrl p from Jeard

Change-Id: Id5c505fae387c74ded446b1ed2297bb4d422d078