Merge pull request #1038 from ermshiperete/bug-xamarin-19818