yglukhov and Araq Fixes #8851 (#8859 )

Latest commit d2eea9e

Sep 4, 2018