This PR polishes a bit.

Comment From: sdeleuze

@izeye Merged and backported to 5.3.x, thanks!

Comment From: izeye

@sdeleuze Thanks!

You might want to change the label to the "type: task" as there are no functional changes here.