We must be all lazy, at least I know I always used -p ;). (cherry picked from commit be440e09) (cherry picked from commit 4682780d)
