Update Merge from New-Edit-Preview-Branch and MenuBar-Branch