Issue #3552561: Move the deprecations to the 2.1.x branch

Closes #3552561

Merge request reports

Loading