Updating with the latest patch from MR #1
Tagging for manual testing.