Co-Authored-By: Timm Schäuble <Timm.Schaeuble@gmail.com> (cherry picked from commit 4c7df31070fbd370b26dbcc07131f21eb88d35fc)