Happy new year to the wonderful Godot community! (cherry picked from commit a627cdafc5)
a627cdafc5
(cherry picked from commit 9b7b0a28b9)
9b7b0a28b9