Added changes from MR 9183

Closes #3223022

added 857 commits

• 83ab1fa6...19a37c38 - 856 commits from branch project:11.x
• edcefae5 - Merge branch '11.x' into 3223022-discard-modal

Compare with previous version

Tugboat has finished building the preview for this merge request!

Link:

• https://mr11723-ubfrvwsxz00xsdduitbrcmdrqjyyx6vl.tugboatqa.com

Dashboard:

• https://dashboard.tugboatqa.com/67eea4ffe026d48ed34994b7