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