Resolve O1E-40

Closed Javier Vescio requested to merge O1E-40 into master

Closes O1E-40

Merge request reports