Merge "Improved AutoFill Save workflow."