Merge pull request #938 from exony-craigminihan/bugzilla#18245