Updated the S18 bundle + docs
Synced from master
Synced from master