Merge "Update Incremental TEST_MAPPING" into main