sync fluff design docs
Merge branch 'master' into fluff_sync