Fixes #4826 - address review comments