Merge "Inject legacy layer in metadata tests" into main