Merge pull request #2545 from ermshiperete/Xamarin-24974