Merge "Fix runtime config tests" into main