Merge "Disable failing test until we can fix it" into main