Re #10137. Fixing indentation issues.
Re #10137. Fixing unit test error.