Merge "Stencil support in new recorder/reorderer"