Re: Please merge ea8912b788f8 to v5.7 and earlier