Merge pull request #961 from ermshiperete/bug-xamarin-18118