Add PR #1851 from the platform

and yes I screwed up the commit message