c6fee0a2c8
resolution. Contributed by Jim Brennan. (cherry picked from commit af389d989770c4218c24e640f572bc7492f7d4b3)