Updated the S18 bundle + docs