Library, Spider updates (both for fixing Spider).
Merge commit '40ae897a41bc1aa5aaf833c4244c4c242c999a2f' into next