Merge "Handle symlinks." into main