Trade 2021.0

Richard Wohlgemuth requested to merge trade_2021.0 into trade

Merge request reports