Merge branch 'dev' into edge
some docs updated
Merge branch 'edge' into dev