develop
Fix part of #25941: Clean up legacy embedded <style> tags from HTML templates removing inconsistency of next 30 files (part-2) (#26855)
Fix part of #10700:Migrated StateObjectFactory to State (#23134)