9.2.x

Applies the patch, and then adds a test. Was having trouble running the test locally, so creating the MR to see if it runs.