On master looks as ok. Could you backport this to 5.3 and 5.2 branches.
5.3
5.2
—You are receiving this because you are subscribed to this thread.Reply to this email directly, view it on GitHub, or mute the thread.