Quote #16590

Update for new quotes, and other option updates.