Re #10137. Fixing indentation errors.
Re #10137. Fixing indentation errors.
Re #10137. Fixing indentation errors.
Merge branch 'feature/10137_pylint_whitespace' into develop