Stable to master without breaking anything (#40881)
* Revert "Merge branch 'master' into stable" This reverts commit3a7c18c394, reversing changes made toe917c8e067. * Reapply "Merge branch 'master' into stable" This reverts commitbe78d23068. --------- Co-authored-by: Vasilis The Pikachu <vasilis@pikachu.systems>
This commit is contained in: