Revert "Merge branch 'revert-51677b07' into 'master'"

Merged Amir MOHAMMADI requested to merge revert-a1a488bb into master

This reverts merge request !228 (merged)

Merge request reports