Re: [rfc][merge request]