@henningw this two commits also need on 5.2 branch.
Reference to #1711 is made to prevent merge conflict on cherry-pick.


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.