Merge branch 'feature/edge_apps' into 'develop'