workshop docs (pass 1)
Merge remote-tracking branch 'origin/target-4.3.18' into target-4.3.18