PR: 2505