Merge branch 'enyo-rewrite'