v1.0.5
6255bbf8 · Merge pull request #17689 from knz/20170816-cherry-pick-17683 ·