Re: [development] For 4.8 inclusion