Merge "Replace the existing mapping table with MatTable"