Add edge support

Merged Ali Fahs requested to merge add-edge-support into proactive-dev-2.5

Merge request reports