Merge pull request #3912 from techee/utils_private