Merge "Refactor auto-fill"