diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7156254f4..c487cc890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 Note: With Docker, please don't use latest tag. Only use release tags.
 See https://github.com/wekan/wekan/issues/3874
 
-# Upcoming Wekan release
+# v5.38 2021-07-18 Wekan release
 
 This release adds the following new features:
 
diff --git a/Stackerfile.yml b/Stackerfile.yml
index fc2d66468..117fd45c6 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v5.37.0"
+appVersion: "v5.38.0"
 files:
   userUploads:
     - README.md
diff --git a/package-lock.json b/package-lock.json
index 27f2342a6..90ae68ba0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.37.0",
+  "version": "v5.38.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 5b4b6d303..c955e5560 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.37.0",
+  "version": "v5.38.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {
diff --git a/public/api/wekan.html b/public/api/wekan.html
index fb327b525..b3289fd3b 100644
--- a/public/api/wekan.html
+++ b/public/api/wekan.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v5.37</title>
+    <title>Wekan REST API v5.38</title>
 
     <style>
     </style>
@@ -1490,6 +1490,8 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
+<!-- backwards compatibility -->
+<!-- backwards compatibility -->
 <!-- backwards compatibility -->
   </head>
 
@@ -1553,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.37">Wekan REST API v5.37</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.38">Wekan REST API v5.38</a>
             
           </li>
         
@@ -1996,6 +1998,16 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
                     
                   </li>
                 
+                  <li>
+                    <a href="#tocs_boardsorgs" class="toc-h2 toc-link" data-title="">BoardsOrgs</a>
+                    
+                  </li>
+                
+                  <li>
+                    <a href="#tocs_boardsteams" class="toc-h2 toc-link" data-title="">BoardsTeams</a>
+                    
+                  </li>
+                
                   <li>
                     <a href="#tocs_cardcomments" class="toc-h2 toc-link" data-title="">CardComments</a>
                     
@@ -2116,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v5.37</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.38</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>
@@ -3516,6 +3528,20 @@ System.out.println(response.toString());
     }
   ],
   <span class="hljs-attr">&quot;permission&quot;</span>: <span class="hljs-string">&quot;public&quot;</span>,
+  <span class="hljs-attr">&quot;orgs&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+    }
+  ],
+  <span class="hljs-attr">&quot;teams&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+    }
+  ],
   <span class="hljs-attr">&quot;color&quot;</span>: <span class="hljs-string">&quot;belize&quot;</span>,
   <span class="hljs-attr">&quot;description&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
   <span class="hljs-attr">&quot;subtasksDefaultBoardId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@@ -18294,6 +18320,20 @@ UserSecurity
     }
   ],
   <span class="hljs-attr">&quot;permission&quot;</span>: <span class="hljs-string">&quot;public&quot;</span>,
+  <span class="hljs-attr">&quot;orgs&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+    }
+  ],
+  <span class="hljs-attr">&quot;teams&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+    }
+  ],
   <span class="hljs-attr">&quot;color&quot;</span>: <span class="hljs-string">&quot;belize&quot;</span>,
   <span class="hljs-attr">&quot;description&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
   <span class="hljs-attr">&quot;subtasksDefaultBoardId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@@ -18413,6 +18453,20 @@ UserSecurity
 <td>visibility of the board</td>
 </tr>
 <tr>
+<td>orgs</td>
+<td>[<a href="#schemaboardsorgs">BoardsOrgs</a>]¦null</td>
+<td>false</td>
+<td>none</td>
+<td>the list of organizations that a board belongs to</td>
+</tr>
+<tr>
+<td>teams</td>
+<td>[<a href="#schemaboardsteams">BoardsTeams</a>]¦null</td>
+<td>false</td>
+<td>none</td>
+<td>the list of teams that a board belongs to</td>
+</tr>
+<tr>
 <td>color</td>
 <td>string</td>
 <td>true</td>
@@ -18982,6 +19036,100 @@ UserSecurity
 </tr>
 </tbody>
 </table>
+<h2 id="tocs_boardsorgs">BoardsOrgs</h2>
+<p><a id="schemaboardsorgs"></a>
+<a id="schema_BoardsOrgs"></a>
+<a id="tocSboardsorgs"></a>
+<a id="tocsboardsorgs"></a></p>
+<pre class="highlight tab tab-json"><code>{
+  <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+}
+
+</code></pre>
+<h3 id="properties-4">Properties</h3>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Type</th>
+<th>Required</th>
+<th>Restrictions</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>orgId</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The uniq ID of the organization</td>
+</tr>
+<tr>
+<td>orgDisplayName</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The display name of the organization</td>
+</tr>
+<tr>
+<td>isActive</td>
+<td>boolean</td>
+<td>true</td>
+<td>none</td>
+<td>Is the organization active?</td>
+</tr>
+</tbody>
+</table>
+<h2 id="tocs_boardsteams">BoardsTeams</h2>
+<p><a id="schemaboardsteams"></a>
+<a id="schema_BoardsTeams"></a>
+<a id="tocSboardsteams"></a>
+<a id="tocsboardsteams"></a></p>
+<pre class="highlight tab tab-json"><code>{
+  <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;isActive&quot;</span>: <span class="hljs-literal">true</span>
+}
+
+</code></pre>
+<h3 id="properties-5">Properties</h3>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Type</th>
+<th>Required</th>
+<th>Restrictions</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>teamId</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The uniq ID of the team</td>
+</tr>
+<tr>
+<td>teamDisplayName</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The display name of the team</td>
+</tr>
+<tr>
+<td>isActive</td>
+<td>boolean</td>
+<td>true</td>
+<td>none</td>
+<td>Is the team active?</td>
+</tr>
+</tbody>
+</table>
 <h2 id="tocs_cardcomments">CardComments</h2>
 <p><a id="schemacardcomments"></a>
 <a id="schema_CardComments"></a>
@@ -18998,7 +19146,7 @@ UserSecurity
 
 </code></pre>
 <p>A comment on a card</p>
-<h3 id="properties-4">Properties</h3>
+<h3 id="properties-6">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19158,7 +19306,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-5">Properties</h3>
+<h3 id="properties-7">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19547,7 +19695,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-6">Properties</h3>
+<h3 id="properties-8">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19646,7 +19794,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-7">Properties</h3>
+<h3 id="properties-9">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19766,7 +19914,7 @@ UserSecurity
 <pre class="highlight tab tab-json"><code>{}
 
 </code></pre>
-<h3 id="properties-8">Properties</h3>
+<h3 id="properties-10">Properties</h3>
 <p><em>None</em></p>
 <h2 id="tocs_checklistitems">ChecklistItems</h2>
 <p><a id="schemachecklistitems"></a>
@@ -19785,7 +19933,7 @@ UserSecurity
 
 </code></pre>
 <p>An item in a checklist</p>
-<h3 id="properties-9">Properties</h3>
+<h3 id="properties-11">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19864,7 +20012,7 @@ UserSecurity
 
 </code></pre>
 <p>A Checklist</p>
-<h3 id="properties-10">Properties</h3>
+<h3 id="properties-12">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -19949,7 +20097,7 @@ UserSecurity
 
 </code></pre>
 <p>A custom field on a card in the board</p>
-<h3 id="properties-11">Properties</h3>
+<h3 id="properties-13">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20087,7 +20235,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-12">Properties</h3>
+<h3 id="properties-14">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20137,7 +20285,7 @@ UserSecurity
 <pre class="highlight tab tab-json"><code>{}
 
 </code></pre>
-<h3 id="properties-13">Properties</h3>
+<h3 id="properties-15">Properties</h3>
 <p><em>None</em></p>
 <h2 id="tocs_integrations">Integrations</h2>
 <p><a id="schemaintegrations"></a>
@@ -20161,7 +20309,7 @@ UserSecurity
 
 </code></pre>
 <p>Integration with third-party applications</p>
-<h3 id="properties-14">Properties</h3>
+<h3 id="properties-16">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20272,7 +20420,7 @@ UserSecurity
 
 </code></pre>
 <p>A list (column) in the Wekan board.</p>
-<h3 id="properties-15">Properties</h3>
+<h3 id="properties-17">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20500,7 +20648,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-16">Properties</h3>
+<h3 id="properties-18">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20555,7 +20703,7 @@ UserSecurity
 
 </code></pre>
 <p>A swimlane is an line in the kaban board.</p>
-<h3 id="properties-17">Properties</h3>
+<h3 id="properties-19">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20828,7 +20976,7 @@ UserSecurity
 
 </code></pre>
 <p>A User in wekan</p>
-<h3 id="properties-18">Properties</h3>
+<h3 id="properties-20">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -20989,7 +21137,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-19">Properties</h3>
+<h3 id="properties-21">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21214,7 +21362,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-20">Properties</h3>
+<h3 id="properties-22">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21246,7 +21394,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-21">Properties</h3>
+<h3 id="properties-23">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21285,7 +21433,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-22">Properties</h3>
+<h3 id="properties-24">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21324,7 +21472,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-23">Properties</h3>
+<h3 id="properties-25">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21363,7 +21511,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-24">Properties</h3>
+<h3 id="properties-26">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21416,6 +21564,8 @@ UserSecurity
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
+<!-- backwards compatibility -->
+<!-- backwards compatibility -->
 <!-- backwards compatibility -->
       </div>
       <div class="dark-box">
diff --git a/public/api/wekan.yml b/public/api/wekan.yml
index 0b8d9d01c..841885259 100644
--- a/public/api/wekan.yml
+++ b/public/api/wekan.yml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v5.37
+  version: v5.38
   description: |
     The REST API allows you to control and extend Wekan with ease.
 
@@ -2690,6 +2690,20 @@ definitions:
         enum:
           - public
           - private
+      orgs:
+        description: |
+           the list of organizations that a board belongs to
+        type: array
+        items:
+          $ref: "#/definitions/BoardsOrgs"
+        x-nullable: true
+      teams:
+        description: |
+           the list of teams that a board belongs to
+        type: array
+        items:
+          $ref: "#/definitions/BoardsTeams"
+        x-nullable: true
       color:
         description: |
            The color of the board.
@@ -2969,6 +2983,44 @@ definitions:
       - userId
       - isAdmin
       - isActive
+  BoardsOrgs:
+    type: object
+    properties:
+      orgId:
+        description: |
+           The uniq ID of the organization
+        type: string
+      orgDisplayName:
+        description: |
+           The display name of the organization
+        type: string
+      isActive:
+        description: |
+           Is the organization active?
+        type: boolean
+    required:
+      - orgId
+      - orgDisplayName
+      - isActive
+  BoardsTeams:
+    type: object
+    properties:
+      teamId:
+        description: |
+           The uniq ID of the team
+        type: string
+      teamDisplayName:
+        description: |
+           The display name of the team
+        type: string
+      isActive:
+        description: |
+           Is the team active?
+        type: boolean
+    required:
+      - teamId
+      - teamDisplayName
+      - isActive
   CardComments:
     type: object
     description:  A comment on a card
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index f64722be1..21a369b46 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 537,
+    appVersion = 538,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.37.0~2021-07-04"),
+    appMarketingVersion = (defaultText = "5.38.0~2021-07-18"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 50b4d3dc5..5d2c2562c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: wekan
-version: '5.37'
+version: '5.38'
 summary: The open-source kanban
 description: |
    Wekan is an open-source and collaborative kanban board application.