Merge pull request #966 from ermshiperete/bug-xamarin-18511