Added CommonParentRowColumnAffinity support