Merge "enable editing in mapping table"