3564435: Fix deprecation.

João Eduardo Ramos Costarequested to merge
issue/content_access-3564435:3564435-fix-deprecation into 2.1.x

Closes #3564435

Merge request reports