changelog updated
Merge branch 'edge' into dev