Applied patch by @ChrisjuhB.
Code standard review, tests still running.
Code standard review, tests still running.