Adding comments to matrix layout in Q1.6