Closes TRADE-539
merged
mentioned in commit 370a0e05
This will create a new commit in order to revert the existing changes.