diff --git a/lib_com/options.h b/lib_com/options.h
index b146e8df7b795993a13e1955ed251e1b0ed5eaf3..ae332cd1566f6c08d2e2ec278c24c85feb998d3b 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -154,6 +154,7 @@
 #define FIX_785_REMOVE_DEAD_CODE                        /* VA: issue 785: remove dead code */
 #define FIX_852_FIX_HANDLE_DEREF                        /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */
 #define FIX_520_REMOVE_MEMMOVE_JBM                      /* VA: issue 520: Remove memmove() from JBM code */
+#define FIX_853_ARRAY_SIZE_MISMATCH                     /* Nokia: Issue #853: Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana */
 
 
 /* #################### End BE switches ################################## */
diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h
index a8b9c029b086f0dd20bb6b908c0f94122d548e0a..38974ba42ea7b06998a4aa76ddde29a6f4646ddd 100644
--- a/lib_rend/ivas_prot_rend.h
+++ b/lib_rend/ivas_prot_rend.h
@@ -1638,6 +1638,23 @@ void ivas_omasa_ana_close(
     OMASA_ANA_HANDLE *hOMasa                                    /* i/o: analysis OMASA handle                   */
 );
 
+#ifdef FIX_853_ARRAY_SIZE_MISMATCH
+void computeIntensityVector_ana(
+    const int16_t *band_grouping,                                /* i  : Band grouping for estimation    */
+    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
+    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */
+    const int16_t num_frequency_bands,                           /* i  : Number of frequency bands       */
+    float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS]   /* o  : Intensity vector                */
+);
+
+void computeReferencePower_ana(
+    const int16_t *band_grouping,                                /* i  : Band grouping for estimation    */
+    float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
+    float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */
+    float *reference_power,                                      /* o  : Estimated power                 */
+    const int16_t num_freq_bands                                 /* i  : Number of frequency bands       */
+);
+#else
 void computeIntensityVector_ana(
     const int16_t *band_grouping,                                       /* i  : Band grouping for estimation    */
     float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
@@ -1653,6 +1670,7 @@ void computeReferencePower_ana(
     float *reference_power,                                             /* o  : Estimated power                 */
     const int16_t num_freq_bands                                        /* i  : Number of frequency bands       */
 );
+#endif
 
 void ivas_create_masa_out_meta(
     MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta,                                   /* i/o: MASA metadata handle            */