Merge branch 'eb/quilt'