Merge "Disable Filename in edit"