I just looked, m_col [4][4]; in mainline code so that change would be outside of this PR and need to be a separate PR that deals with fixing that issue.