Added functionality from issue patch

Georgi Gerovrequested to merge
feature/issue-3499876 into 1.0.x

This MR contains the proposed changes from this issue.

Merge request reports