Merge "docs: Revised Espresso code snippets" into nyc-dev