Merge pull request #12493 from drodriguez/patch-1

Keep code consistent with previous code blocks.