Merge "Turn on .so path by default"