What does this PR do?
Addresses #537
Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines