Co-authored-by: silverwind <me@silverwind.io> (cherry picked from commit 58a03e9fadb345de5653345c2a68ecfd0750940a)