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

catch created pipeline for commit 4e87557c

Apr 22, 2024, finished Apr 22, 2024

Related merge request !7650 to merge 3442660-remove-deprecated-code into 11.x

5 minutes 50 seconds, queued for 27 seconds