PR: 3165
PR: 3165 (cherry picked from commit d24d1d7daf515aa19fbf18f6371e3e617028a07c)
(from HEAD, original by Andy).