diff --git a/doc/cla/corporate/coloop.md b/doc/cla/corporate/coloop.md
new file mode 100644
index 00000000000..ed8b37470ca
--- /dev/null
+++ b/doc/cla/corporate/coloop.md
@@ -0,0 +1,16 @@
+United Kingdom, 2020-07-21
+
+Coloop Ltd. agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Alex Hafner alex.hafner@coloop.com https://github.com/alexhafner
+
+List of contributors:
+
+Alex Hafner alex.hafner@coloop.com https://github.com/alexhafner
+Herbert Riess herbert.riess@coloop.com https://github.com/r13ssh
\ No newline at end of file
diff --git a/odoo/addons/base/tests/test_osv.py b/odoo/addons/base/tests/test_osv.py
index be284c3fd78..d6d8a137f49 100644
--- a/odoo/addons/base/tests/test_osv.py
+++ b/odoo/addons/base/tests/test_osv.py
@@ -79,7 +79,7 @@ class QueryTestCase(BaseCase):
         tmp_cat_cmp_par = query.join(tmp_cat_cmp, 'partner_id', 'res_partner', 'id', 'partner_id')
         self.assertEqual(tmp_cat_cmp_par, 'product_product__product_tmpl_id__product_category_id__56d55687')
         tmp_cat_stm_par = query.join(tmp_cat_stm, 'partner_id', 'res_partner', 'id', 'partner_id')
-        self.assertEqual(tmp_cat_stm_par, 'product_product__product_tmpl_id__product_category_id__9_363fdd')
+        self.assertEqual(tmp_cat_stm_par, 'product_product__product_tmpl_id__product_category_id__00363fdd')
 
     def test_table_expression(self):
         query = Query(None, 'foo')
diff --git a/odoo/osv/query.py b/odoo/osv/query.py
index 6edb08b4a65..a6d414d2d29 100644
--- a/odoo/osv/query.py
+++ b/odoo/osv/query.py
@@ -41,9 +41,7 @@ def _generate_table_alias(src_table_alias, link):
     if len(alias) >= 64:
         # We have to fit a crc32 hash and one underscore into a 63 character
         # alias. The remaining space we can use to add a human readable prefix.
-        alias_hash = hex(crc32(alias.encode('utf-8')))[2:]
-        ALIAS_PREFIX_LENGTH = 63 - len(alias_hash) - 1
-        alias = "%s_%s" % (alias[:ALIAS_PREFIX_LENGTH], alias_hash)
+        alias = "%s_%08x" % (alias[:54], crc32(alias.encode('utf-8')))
     return alias