Merge "Update ravenwood TEST_MAPPING" into main