Re: Mentoring for implementing #8004