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