task: #3574086 Deprecation notices fixes

Frank Mablyrequested to merge
issue/domain-3574086:3574086-deprecation-notices-fixes into 3.x

By: mably

Closes #3574086

Merge request reports