Merge pull request #1040 from ermshiperete/bug-xamarin-19856