Re #10137. Reverting to version from master to fix unit test.
Merge branch 'feature/10137_pylint_whitespace' into develop