Merge branch 'Edit-Master'