CA-149815: Fixed by adjusting the table layout for ZHCn