Merge remote-tracking branches 'origin/mr/1420', 'origin/mr/1400',...

Merge remote-tracking branches 'origin/mr/1420', 'origin/mr/1400', 'origin/mr/1428' and 'origin/mr/1430' into wip/configurator_trade