Closes TRADE-633
merged
mentioned in commit 02799f69
This will create a new commit in order to revert the existing changes.