PR: 2556 (partial)