5.12.0
#### PR checklist - [X] Addresses an existing issue: #4391 #### Overview of change: Fix test that failed locally because it took too long. Not sure why this is only becoming an issue now - could be something that got added, but for now we may as well get 5.12 released and then figure it out.