[TAC-156] container matrix refactoring