Happy new year to the wonderful Godot community!
(cherry picked from commit fd86272ca0)
fd86272ca0
(cherry picked from commit 7ca1be5f37)
7ca1be5f37