Merge "Remove Save metadta and Save Sources Button"