Merge branch 'cleanup/deprecated3.5' into 'master'

Remove deprecated code from before release/3.5.

See merge request !185

(cherry picked from commit b88c03af)

79eff692 Remove deprecated code from before release/3.5.
1 job for !186 with cherry-pick-b88c03af
latest merge request