merge PR #5309

merge PR #5309