Merge branch 'blaze'