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