Closes # What has been done to verify that this works as intended? Why is this the best possible solution? Were any other approaches considered? Are there any risks to merging this code? If so, what are they?