Closes TRADE-501
merged
mentioned in commit 5b90475e
This will create a new commit in order to revert the existing changes.
