Merge branch 'nd/sq-quote-buf'