Edge support

Merged Jan Marchel requested to merge edge-support into proactive-dev-2.5

Merge request reports