QUO Code Move

Hi Bob,

Can you merge these changes into your mainline?