Merge branch '3442693-remove-deprecated-code' into '11.x'

catch created pipeline for commit 393bee4f

Apr 22, 2024, finished Apr 22, 2024

Related merge request !7654 to merge 3442693-remove-deprecated-code into 11.x

12 minutes 23 seconds, queued for 28 seconds