Merge "Upgrade quote to 1.0.21"