Added functionality from issue

Georgi Gerovrequested to merge
issue-3499876 into 1.0.x

This MR contains the proposed changes from this issue.

This time without .idea directory.

Merge request reports