Merge pull request #954 from ermshiperete/bug-xamarin-8907