Closes TRADE-342
merged
mentioned in commit f8ffe918
This will create a new commit in order to revert the existing changes.