Fixes #5821 - address PR review issues