Here is the requested merge request. I was not sure to which branch I should merge into, change as needed.