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