Upgrade from xrm/master

Richard Wohlgemuth requested to merge master into trade

Merge request reports