3.0.x backport

Claudiu Cristearequested to merge
issue/private_message-3501286:3501286-3.0.x into 3.0.x

Closes #3501286

Merge request reports