[UPDATE] O1E-33 to O1E-37 resolved

Merged Javier Vescio requested to merge O1E-35 into master

Closes O1E-35

Merge request reports