diff --git a/CHANGELOG.md b/CHANGELOG.md
index b844f00b..af9b5d76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,15 @@
 
 ## Unreleased
 
+### Fixes
+
+- [Pull request #162: Fix line height spacing for multiline code elements](https://github.com/alphagov/tech-docs-gem/pull/162)
+- [Pull request #165: Update header alignment to match layout](https://github.com/alphagov/tech-docs-gem/pull/165)
+
 ## 2.0.10
 
+### Fixes
+
 - [Pull request #160: Make sure IDs on collapsible navigation are unique](https://github.com/alphagov/tech-docs-gem/pull/160)
 
 ## 2.0.9
diff --git a/example/source/code.html.md b/example/source/code.html.md
index 2e860a33..438adfec 100644
--- a/example/source/code.html.md
+++ b/example/source/code.html.md
@@ -8,6 +8,35 @@ A paragraph with a `code` element within it.
 
 <a href="#"><code>code element within a link</code></a>
 
+An example of a table with a `code` element within it.
+
+<div class="table-container">
+  <table>
+    <thead>
+      <tr>
+        <th style="text-align:left">httpResult</th>
+        <th style="text-align:left">Message</th>
+        <th style="text-align:left">How to fix</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td style="text-align:left"><code>400</code></td>
+        <td style="text-align:left">
+          <code>[{</code>
+          <br />
+          <code>"error": "BadRequestError",</code>
+          <br />
+          <code>"message": "Can't send to this recipient using a team-only API key"</code>
+          <br />
+          <code>]}</code>
+        </td>
+        <td style="text-align:left">Use the correct type of API key</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
 An example of a code block with a long line length
 
 ```ruby
@@ -32,4 +61,4 @@ An example of a code block with a short length
 ```ruby
 RSpec.describe ContentItem do
 end
-```
\ No newline at end of file
+```
diff --git a/lib/assets/stylesheets/modules/_technical-documentation.scss b/lib/assets/stylesheets/modules/_technical-documentation.scss
index 8c3cdee5..cc76de64 100644
--- a/lib/assets/stylesheets/modules/_technical-documentation.scss
+++ b/lib/assets/stylesheets/modules/_technical-documentation.scss
@@ -139,6 +139,8 @@
     font-family: monaco, Consolas, "Lucida Console", monospace;
     font-size: 15px;
     font-size: 0.9375rem;
+    // Match the line-height outside of tables
+    line-height: 1.4;
     color: $code-0E;
 
     @include govuk-media-query(tablet) {