With regards to the OTP turnaround, the x-ray machine chap did not go anywhere near my passport - so I fail to see why one needs to actually go upstairs at all.
You're given nothing, other than a nod, and sent back downstairs.
It seems farcical, so depending on how much time I have on Monday (and how busy the flight is), I won't bother going upstairs, but will tell the x-ray person that I have.
I'll update once I try.
M