Co-authored-by: Jan-Niklas Burfeind <github@aiyionpri.me>
(cherry picked from commit 68bec1f0)