Merge branch 'fix_pin_quotes' into 1.4.x