Pulling in updates from PR #5087