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