Merge "Disable failing test" into main