--- a/CITATION.cff	Wed Jan 22 12:02:24 2025 +0100
+++ b/CITATION.cff	Wed Jan 22 13:09:04 2025 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"
-version: 1.12.5
-date-released: 2024-12-17
+version: 1.12.6
+date-released: 2025-01-22

--- a/NEWS	Wed Jan 22 12:02:24 2025 +0100
+++ b/NEWS	Wed Jan 22 13:09:04 2025 +0100
@@ -1,10 +1,14 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.12.6 (2025-01-22)
+===========================
+
 General
 -------
 
-* DICOM: Added support for C-GET SCU, through the new route "/modalities/{id}/get".
+* DICOM: Added support for C-GET SCU.
 * Added new configuration options:
   - "AcceptedSopClasses" and "RejectedSopClasses" to limit the SOP classes
     accepted by Orthanc when acting as C-STORE SCP.
@@ -17,6 +21,12 @@
     the number of concurrent DCMTK transcoders that are simultaneously running
     at any given time.
 
+REST API
+--------
+
+* API version upgraded to 27
+* C-GET SCU requests can be triggered through the new route "/modalities/{id}/get"
+
 Plugins
 -------
 
@@ -41,8 +51,15 @@
     When not, the files are ordered in the same order as the instances in the series.
   - Added optimization to use the "ExtendedFind" extension, hereby reducing the number
     of SQL queries.
+* DICOM negotiation:
+  - When opening a DICOM SCU connection, Orthanc now only proposes the contexts that it is
+    going to use in the connection, and not all the contexts as in previous versions
+    (e.g., if performing a C-ECHO, Orthanc will not propose C-MOVE or C-FIND).
+* DICOM C-GET SCP: Orthanc will not refuse anymore to send, for instance, a
+  LittleEndianExplicit file, if the accepted transfer syntax is a compressed one.
 * By default, DCMTK now uses its own "oficonv" library for character set conversion.
   This can be tuned using the new CMake option "-DDCMTK_LOCALE_BACKEND=oficonv".
+* Improved progress reporting for DicomMoveScu jobs.
 * Upgraded dependencies for static builds:
   - dcmtk 3.6.9
 
@@ -101,36 +118,11 @@
   https://dicom.nema.org/medical/dicom/current/output/chtml/part18/sect_F.2.3.html
   This has no impact on the Stone Web viewer and OHIF:
   https://discourse.orthanc-server.org/t/dicomwebplugin-does-not-return-series-metadata-properly/5195
-* /queries/../retrieve now accepts a new field in the payload: "RetrieveMethod" to define wheter 
-  Orthanc uses C-MOVE or C-GET to retrieve the resource.
-* improved progress reporting of DicomMoveScu jobs.
 
 Maintenance
 -----------
 
 * DICOM TLS: "DicomTlsTrustedCertificates" is not required anymore when issuing
-<<<<<<< working copy
-  an outgoing SCU connexion when "DicomTlsRemoteCertificateRequired" is set to false.
-* DICOM negotiation:
-  - When opening a DICOM SCU connection, Orthanc now only proposes the contexts that it is
-    going to use in the connection and not all contexts as in previous versions.  E.g, when
-    performing a C-ECHO, Orthanc will not propose C-MOVE or C-FIND.
-* DICOM Get-SCP: Orthanc won't refuse anymore to send e.g. a LittleEndianExplicit file when
-  the accepted transfer syntax is a compressed one.
-* Introduced a new thread to update the statistics at regular interval for the
-  DB plugins that are implementing the UpdateAndGetStatistics function (currently only
-  PostgreSQL).  This avoids very long update times in case you don't call /statistics
-  for a long period.
-* Fix C-Find queries not returning computed tags like ModalitiesInStudy, NumberOfStudyRelatedSeries, ...
-  in very specific use-cases.
-* Fix C-Find queries not returning private tags in the modality worklist plugin.
-* Fix extremely rare error when 2 threads are trying to create the same folder in the File Storage 
-  at the same time.
-* Fix crashes if handling very large images.
-* Fix deadlock when parsing specific invalid DICOM files.
-* Loading plugins:
-  - Orthanc will now fail to start when provided with a plugin path that can not be found.
-=======
   an outgoing SCU connection if "DicomTlsRemoteCertificateRequired" is set to "false"
 * Fix C-Find queries not returning computed tags such as ModalitiesInStudy,
   NumberOfStudyRelatedSeries,... in very specific use cases
@@ -141,7 +133,6 @@
 * Fix deadlock when parsing specific invalid DICOM files
 * Loading plugins: Orthanc will now fail to start when provided with a plugin path
   that can not be found
->>>>>>> merge rev
 * Metrics:
   - Fix a few metrics that were not published
   - Added 2 metrics: "orthanc_storage_cache_miss_count" and "orthanc_storage_cache_hit_count"

--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Jan 22 12:02:24 2025 +0100
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Wed Jan 22 13:09:04 2025 +0100
@@ -25,7 +25,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.12.6")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning
@@ -39,7 +39,7 @@
 # Version of the Orthanc API, can be retrieved from "/system" URI in
 # order to check whether new URI endpoints are available even if using
 # the mainline version of Orthanc
-set(ORTHANC_API_VERSION "26")
+set(ORTHANC_API_VERSION "27")
 
 
 #####################################################################