This is part 2/2 of the patches for #7090. Adds one-step call parking to /trunk...