Fixes: #24075 ## Bug - [X] Related issues linked using `fixes #number` - [X] Integration tests added ## Documentation / Examples - [x] Make sure the linting passes