Merge with local changes made in Godot (Manuel)