Merging fix for gh-369