6.1.2
Merge branch '5.4-dev' into 6.1/maint/upmerge-260622
Merge branch '6.0-dev' into 6.1/maint/upmerge-260312
[6.1] fix webauth phpstan issues (#46735)