ea84079f8b
Merging: fix is correct, tests comprehensive, lint failures are pre-existing issues unrelated to this PR.
Merging: fix is correct, tests comprehensive, lint failures are pre-existing issues unrelated to this PR.