diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index f9f888fa..91c939db 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,22 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 43dd9ee17894a22fa3df88b1e561274632d9ab43
+<pre class='wrap'>commit 5d0a8b08dcd3bcdf532c54702b5a88ec61b17918
+Merge: 43dd9ee 8f5aff1
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-12-05 11:39:23 +0100
+
+    Merge pull request #1304 from rouault/fix_1302
+    
+    pi.c: avoid out of bounds access with POC (fixes #1302)
+
+commit 8f5aff1dff510a964d3901d0fba281abec98ab63
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-12-04 20:45:25 +0100
+
+    pi.c: avoid out of bounds access with POC (fixes #1302)
+
+commit 43dd9ee17894a22fa3df88b1e561274632d9ab43
 Merge: aaff099 4ce7d28
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-12-04 20:37:43 +0100
@@ -874,18 +889,6 @@ Date:   2019-04-25 01:29:38 +0200
 
     Add test for previous commit
 
-commit 6423163141412cb93364de4e33d90bcffefa0885
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2019-04-25 01:27:02 +0200
-
-    Fix POC in multi-tile scenarios: avoid almost endless loop when a tile has no POC settings
-
-commit b86717fdd36b628ea7ecb5c24f7a086bf5bcd3a7
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2019-04-25 00:40:04 +0200
-
-    Add test for previous commit
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 3a0b13c2..e0deb0df 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -705,7 +705,7 @@ $VAR1 = {
                       '2.2.0' => '2017-08-10 00:31',
                       '2.3.0' => '2017-10-04 22:23',
                       '2.3.1' => '2019-04-02 10:08',
-                      'current' => '2020-12-04 20:37:43'
+                      'current' => '2020-12-05 11:39:23'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1607128153',
+          'ScmUpdateTime' => '1607166363',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'
diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a
index 961dc38d..dd55b4e0 100644
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a differ
diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1
index 3824d02d..2e37b704 100644
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 differ
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a
index ad69d454..2b568df4 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.a and b/abi-check/installed/openjpeg/current/lib/libopenjp2.a differ
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1
index e5027fcf..780c9124 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 differ
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index 208df5cd..d835bbc5 100644
--- a/abi-check/timeline/openjpeg/index.html
+++ b/abi-check/timeline/openjpeg/index.html
@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2020-12-04<br/>20:37</td>
+<td>2020-12-05<br/>11:39</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.3.1/current/report.html'>100%</a></td>
@@ -179,7 +179,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Dec  5 00:29:49 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Dec  5 11:06:38 2020.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>