Dear Fujii-san,
> I think this fix should be backpatched to all supported versions.
> Since the issue you found and the one I found seem different,
> I'd prefer committing them separately.
I have no objections.
> If that works for you,
> here are the commit log messages I'm considering.
LGTM, thanks.
Best regards,
Hayato Kuroda
FUJITSU LIMITED
