Merge branch 'Edit-Master' into Version-2