Merge "Allow edit list atom to appear earlier in the file"