Merge pull request #932 from exony-craigminihan/bugzilla#18182