ref #7589 Layer refactoring for character matrix