Make the dir before creating a symlink in it.
Cherry pick .floo commits from st3 branch
Merge master. Fix conflict