develop
Fix part of #25997: Replace async() with waitforasync() (#26473)
Merge remote-tracking branch 'upstream/develop' into rich-text-icons
Fix part of #18921: Replace user-referenced TODO comments with issue-referenced TODO comments (#20458)
