Thankyou cotton. What you have quoted/described is what is now required, it seems.
I don't know what to make of this. I could seek clarification from the folks in the unit but I'd probably get a third, distinct answer ! Is it possible that individual units are permitted a slight deviation from the rule book ?