Done also in 2.83 release branch to avoid too much conflicts on merging (some of those were already done for nodes in master, and gave me conflicts yesterday...).
Done also in 2.83 release branch to avoid too much conflicts on merging (some of those were already done for nodes in master, and gave me conflicts yesterday...).