PR: 1887 (part)