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