Merge "Update PinnerService TEST_MAPPING" into main