What does this MR do?

Addresses #843 (closed)

Contribution Guidelines

By submitting this merge request, you agree to follow our Contribution Guidelines

I agree to follow this project's Contribution Guidelines
I have made sure to test this merge request