Amend PR #5311 with an comment and issue ref.

As per discussion in PR #5311, related to issue #5310.
Merge pull request #5350 from busykai/amend-pr-5311

Amend PR #5311 with an comment and issue ref.