3.0-dev1 update 11

Follow symlinks fix & optimizations