diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3487ad701a52deea3e4fb6cfc0e10cd147e19538..0613f3af73e548d234dab617cfd006fccd67e959 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
   EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
-  REFERENCE_BRANCH: "ivas-float-update"
+  FLOAT_REF_BRANCH: "ivas-float-update"
   BUILD_OUTPUT: "build_output.txt"
   SCRIPTS_DIR: "/usr/local/scripts"
   EXIT_CODE_NON_BE: 123
@@ -13,10 +13,20 @@ variables:
   SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
   LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
   TEST_SUITE: ""
+  # These path variables are used by the pytest calls.
+  # They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
   DUT_ENCODER_PATH: "./IVAS_cod"
   DUT_DECODER_PATH: "./IVAS_dec"
   REF_ENCODER_PATH: "./IVAS_cod_ref"
   REF_DECODER_PATH: "./IVAS_dec_ref"
+  MERGE_TARGET_ENCODER_PATH: "./IVAS_cod_merge_target"
+  MERGE_TARGET_DECODER_PATH: "./IVAS_dec_merge_target"
+  # These path variables are used for building the binaries
+  # They should never be overwritten!
+  REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_ref"
+  REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_ref"
+  MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"
+  MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
   LEVEL_SCALING: "1.0"
   IVAS_PIPELINE_NAME: ''
   BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
@@ -33,7 +43,15 @@ variables:
   TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"
   BUILD_WITH_DEBUG_MODE_INFO: ""
   ENCODER_TEST: ""
+  DELTA_ODG: ""
+  COMPARE_DMX: ""
   SKIP_REGRESSION_CHECK: ""
+  FAILED_TESTCASES_LIST: "failed-testcases.txt"
+  ERRORS_TESTCASES_LIST: "errors-testcases.txt"
+  PYTEST_CACHE_ARTIFACT: "pytest_cache.zip"
+  FLOAT_REF_COMMIT_FILE: "float-ref-git-sha"
+  CUT_COMMIT_FILE: "CuT-git-sha"
+  MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha"
   MANUAL_PIPELINE_TYPE:
     description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
     value: 'default'
@@ -49,6 +67,7 @@ variables:
       - 'complexity'
       - 'coverage'
       - 'voip-be-test'
+      - 'peaq-enc-passthrough'
 
 
 default:
@@ -97,6 +116,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'voip-be-test'
       variables:
         IVAS_PIPELINE_NAME: 'Voip BE test on $CI_COMMIT_BRANCH'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'
+      variables:
+        IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
     - if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch
       variables:
         IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'        
@@ -106,6 +128,7 @@ stages:
   - .pre
   - prevalidate
   - build
+  - check-be
   - test
   - compare
   - postvalidate
@@ -195,32 +218,49 @@ stages:
   -   sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUG_MODE_INFO\ *\)\*\//\1/g" lib_com/options.h
   - fi
 
-.build-reference-binaries: &build-reference-binaries
+.build-float-ref-binaries: &build-float-ref-binaries
+  - git rev-parse HEAD > $CUT_COMMIT_FILE
   - current_commit_sha=$(git rev-parse HEAD)
   ### build reference binaries
-  - git checkout $REFERENCE_BRANCH
-  - git pull
+  - git checkout $FLOAT_REF_BRANCH
+  - git pull origin $FLOAT_REF_BRANCH
   - *activate-debug-mode-info-if-set
   - make clean
   - make -j
-  - mv ./IVAS_cod ./$REF_ENCODER_PATH
-  - mv ./IVAS_dec ./$REF_DECODER_PATH
+  - mv ./IVAS_cod ./$REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
+  - mv ./IVAS_dec ./$REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
   - mv ./IVAS_rend ./IVAS_rend_ref
   ### Return to current branch
   - git restore .
+  - git rev-parse HEAD > $FLOAT_REF_COMMIT_FILE
   - git checkout $current_commit_sha
 
+.build-merge-target-binaries: &build-merge-target-binaries
+  - current_commit_sha=$(git rev-parse HEAD)
+  ### build merge target binaries
+  - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+  - git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+  - *activate-debug-mode-info-if-set
+  - make clean
+  - make -j
+  - mv ./IVAS_cod ./$MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY
+  - mv ./IVAS_dec ./$MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY
+  - mv ./IVAS_rend ./IVAS_rend_merge_target
+  ### Return to current branch
+  - git restore .
+  - git rev-parse HEAD > $MERGE_TARGET_COMMIT_FILE
+  - git checkout $current_commit_sha
 
-.build-reference-and-dut-binaries: &build-reference-and-dut-binaries
+.build-float-ref-and-dut-binaries: &build-float-ref-and-dut-binaries
 ### build reference binaries
-  - *build-reference-binaries
+  - *build-float-ref-binaries
 ### build dut binaries
   - *activate-debug-mode-info-if-set
   - make clean
   - make -j
 
-.build-and-create-reference-outputs: &build-and-create-reference-outputs
-  - *build-reference-and-dut-binaries
+.build-and-create-float-ref-outputs: &build-and-create-float-ref-outputs
+  - *build-float-ref-and-dut-binaries
 
   ### prepare pytest
   # create short test vectors
@@ -238,7 +278,7 @@ stages:
   - git fetch
   - git restore . # Just as a precaution
   - git checkout $BASOP_CI_BRANCH_PC_REPO
-  - git pull
+  - git pull origin $BASOP_CI_BRANCH_PC_REPO
   - cd -
   - cp -r $SCRIPTS_DIR/ci .
   - cp -r $SCRIPTS_DIR/scripts .
@@ -279,6 +319,13 @@ stages:
   - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt"
   - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }
 
+.rules-merge-request:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+    - when: never
+
 .rules-pytest-to-ref-short:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
@@ -302,11 +349,19 @@ stages:
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
 
-.rules-mr-to-main-or-main-pc-or-manual:
+.rules-mr-to-main-or-main-pc:
   rules:
     - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
       when: never
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main-pc")
+    - if: $CI_PIPELINE_SOURCE == 'push'
+      when: never
+
+.rules-mr-to-main-or-main-pc-or-manual:
+  rules:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
+    - if: $CI_MERGE_REQUEST_TITLE =~ /^(\[Draft\]|\(Draft\)|Draft:)/
+      when: never
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main-pc")
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
@@ -401,17 +456,20 @@ stages:
 .build-job-linux:
   stage: build
   timeout: "2 minutes"
-  needs: []
   tags:
     - ivas-linux
 
 .build-job-windows:
   stage: build
-  needs: []
   timeout: "4 minutes"
   tags:
     - ivas-windows
 
+.print-results-banner: &print-results-banner
+  -   set +x
+  -   echo ""
+  -   echo -e "==================================================================================================================\n================================================== TEST RESULTS ==================================================\n==================================================================================================================\n"
+
 # template for test jobs on linux that need the TESTV_DIR
 .test-job-linux-needs-testv-dir:
   extends: .test-job-linux
@@ -447,11 +505,23 @@ stages:
     -   *apply-testv-scaling
     - fi
 
-    - if [ "$ENCODER_TEST" = "true" ]; then BUILD_WITH_DEBUG_MODE_INFO="true"; fi
-    - *build-and-create-reference-outputs
+    - if [ "$COMPARE_DMX" = "true" ] || [ "$ENCODER_TEST" = "true" ]; then
+    -   BUILD_WITH_DEBUG_MODE_INFO="true"
+    - fi
+    - *build-and-create-float-ref-outputs
 
     - comp_args="--mld --ssnr --odg"
+
+    - summary_args="MLD DIFF SSNR ODG"
+    - REPORT_ARG=""
     - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
+    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; summary_args="${summary_args} DELTA_ODG"; REPORT_ARG="--delta_odg"; fi
+
+    # DMX comparison only in manual job with no other metrics
+    - if [ "$COMPARE_DMX" = "true" ]; then
+    -   comp_args="--compare_enc_dmx"
+    - fi
+
     - echo "$comp_args"
 
     ### run pytest
@@ -459,10 +529,10 @@ stages:
     - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
 
-    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME
+    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME $REPORT_ARG
     - mkdir $IMAGES_ARTIFACT_NAME
-    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
-    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
+    - for MEASURE in $summary_args;do python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done
+    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME --measures $summary_args
 
     - if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
     -    id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
@@ -510,10 +580,129 @@ stages:
       junit:
         - report-junit.xml
 
-.ivas-pytest-on-merge-request-anchor: &ivas-pytest-on-merge-request-anchor
-  stage: test
+.check-up-to-date-in-comparison-jobs: &check-up-to-date-in-comparison-jobs
+    - *get-commits-behind-count
+    - |
+      if [ $commits_behind_count -ne 0 ]; then
+        set +x
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run. Checking bitexactness or testing for regressions now can result in meaningless results. Run\n\t git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
+.check-be-to-target-anchor: &check-be-to-target-anchor
+  stage: check-be
   needs: ["build-codec-linux-make"]
   timeout: "300 minutes"
+  variables:
+    XML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
+    HTML_REPORT: "report--$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.html"
+    PYTEST_LOG_TARGET_BRANCH: "pytest-log-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME.txt"
+  script:
+    - *print-common-info
+
+    - set -euxo pipefail
+
+    - *update-scripts-repo
+    - python3 tests/create_short_testvectors.py
+
+    - if [ $USE_LTV -eq 1 ]; then
+    -    *update-ltv-repo
+    -    *copy-ltv-files-to-testv-dir
+    -    testcase_timeout=$TESTCASE_TIMEOUT_LTV
+    - else
+    -    testcase_timeout=$TESTCASE_TIMEOUT_STV
+    - fi
+
+    - python3 ci/remove_unsupported_testcases.py $PRM_FILES
+    - python3 scripts/prepare_combined_format_inputs.py
+
+    - if [ $LEVEL_SCALING != "1.0" ];then
+    -   *apply-testv-scaling
+    - fi
+
+    - *build-float-ref-binaries
+    - *build-merge-target-binaries
+    - make clean
+    - make -j
+    - *check-up-to-date-in-comparison-jobs
+
+    - exit_code_target=0
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
+
+    - exit_code=0
+    - rm -rf .pytest_cache || true
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --mld --ssnr --odg --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt || exit_code=$?
+
+    - if [ $exit_code -ne 0 ]; then
+    -   exit_code=$EXIT_CODE_NON_BE
+    -   zip -r $PYTEST_CACHE_ARTIFACT .pytest_cache
+
+    -   grep "^FAILED" pytest_log.txt | sed "s/^FAILED /'/" | sed "s/] - .*/]'/" | tr "\n" " " > $FAILED_TESTCASES_LIST || true
+    -   grep "^FAILED" pytest_log.txt | sed "s/^FAILED //" | sed "s/] - .*/]/" > failed_testcases_for_printing.txt || true
+    -   num_failures=$(wc -l < failed_testcases_for_printing.txt)
+
+    -   grep "^ERROR" pytest_log.txt | sed "s/^ERROR /'/" | sed "s/] - .*/]'/" | tr "\n" " " > $ERRORS_TESTCASES_LIST || true
+    -   grep "^ERROR" pytest_log.txt | sed "s/^ERROR //" | sed "s/] - .*/]/" > errors_testcases_for_printing.txt || true
+    -   num_errors=$(wc -l < errors_testcases_for_printing.txt)
+
+    -   *print-results-banner
+    -   echo "Found these $num_failures non-bitexact testcases:"
+    -   cat failed_testcases_for_printing.txt
+
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the html report in the job artifacts."
+    -   if [ $num_errors -ne 0 ]; then
+    -     exit_code=1
+    -     echo "There were errors present in the following testcases:"
+    -     cat errors_testcases_for_printing.txt
+    -   fi
+
+    -   exit $exit_code
+    - else
+    # create empty files to not have errors at artifact stage
+    -   touch $FAILED_TESTCASES_LIST
+    -   touch $ERRORS_TESTCASES_LIST
+    -   touch $PYTEST_CACHE_ARTIFACT
+    -   *print-results-banner
+    -   echo "All testcases are bitexact."
+    - fi
+    - exit $exit_code
+
+  allow_failure:
+    exit_codes:
+      - 123
+  artifacts:
+    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
+    expire_in: 1 week
+    when: always
+    paths:
+      - $XML_REPORT
+      - $HTML_REPORT
+      - $FAILED_TESTCASES_LIST
+      - $ERRORS_TESTCASES_LIST
+      - pytest_log.txt
+      - $PYTEST_CACHE_ARTIFACT
+      - $FLOAT_REF_COMMIT_FILE
+      - $CUT_COMMIT_FILE
+      - $MERGE_TARGET_COMMIT_FILE
+      - $PYTEST_LOG_TARGET_BRANCH
+    expose_as: "pytest compare results"
+    reports:
+      junit:
+        - $XML_REPORT
+        - $XML_REPORT
+
+.overwrite-pytest-cache-with-artifact: &overwrite-pytest-cache-with-artifact
+  - if [ -f $PYTEST_CACHE_ARTIFACT ]; then
+  -   rm -rf .pytest_cache || true
+  -   unzip $PYTEST_CACHE_ARTIFACT
+  - fi
+
+.check-regressions-pytest-anchor: &check-regressions-pytest-anchor
+  stage: test
+  timeout: "300 minutes"
   variables:
     XML_REPORT_BRANCH: "report-junit-branch-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
     XML_REPORT_MAIN: "report-junit-main-$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA.xml"
@@ -524,9 +713,22 @@ stages:
     IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
     SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
   script:
-    - set -euxo pipefail
     - *print-common-info
+
+    - set -euxo pipefail
+
+    - if [ -s $FAILED_TESTCASES_LIST ]; then
+    -   *overwrite-pytest-cache-with-artifact
+    -   export PYTEST_ADDOPTS=--last-failed
+    - else
+    # turn off echoing back of commands for result printout
+    -   *print-results-banner
+    -   echo -e "All tested cases were bit-exact between $CI_MERGE_REQUEST_TARGET_BRANCH_NAME and $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME.\nNo need to check for regressions. All is fine."
+    -   exit 0
+    - fi
+
     - *update-scripts-repo
+
     - if [ $USE_LTV -eq 1 ]; then
     -    *update-ltv-repo
     -    *copy-ltv-files-to-testv-dir
@@ -546,9 +748,11 @@ stages:
 
     ### run branch first
     # this per default builds the branch and the reference and creates the reference outputs
-    - *build-and-create-reference-outputs
-    - exit_code=0
-    - python3 -m pytest --tb=no $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || exit_code=$?
+    - *build-and-create-float-ref-outputs
+    - *check-up-to-date-in-comparison-jobs
+    # need to restore cache again
+    - *overwrite-pytest-cache-with-artifact
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - zero_errors_branch=$(cat $XML_REPORT_BRANCH | grep -c 'errors="0"') || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_BRANCH $CSV_BRANCH
 
@@ -565,44 +769,37 @@ stages:
     - git pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     - make clean
     - make -j
-    - python3 -m pytest --tb=no $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
+    # need to restore cache again
+    - *overwrite-pytest-cache-with-artifact
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN --mld --ssnr --odg --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN
 
-    # If outputs of main and branch are equal, have equal reports and no run errors were encountered, the job will pass.
-    - diff_sba=0
-    - diff_param=0
-    - diff_report=0
-    # SHORT_TEST_SUITE_ENCODER does not contain test_sba.py. This leads to non-existing output folders being compared and to diff_sba=1. Therefore, this is skipped for the encoder tests
-    - if [ "$TEST_SUITE" != "$SHORT_TEST_SUITE_ENCODER" ]; then
-    -     python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/sba_bs/raw tests/dut_branch/sba_bs/raw || diff_sba=$?
-    - fi
-    - python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/param_file/dec tests/dut_branch/param_file/dec || diff_param=$?
-    - diff $CSV_BRANCH $CSV_MAIN || diff_report=$?
-    - if [ $diff_param -eq 0 ] && [ $diff_sba -eq 0 ] && [ $diff_report -eq 0 ] && [ $zero_errors_branch -eq 1 ]; then
-    -    echo "Output BE to main, identical report and no run errors encountered."
-         # Add dummy files to avoid warning on missing artifacts
-    -    touch changes_crashes.csv
-    -    touch changes_MLD.csv
-    -    touch changes_MAXIMUM_ABS_DIFF.csv
-    -    touch changes_MIN_SSNR.csv
-    -    touch changes_MIN_ODG.csv
-    -    exit 0;
-    - fi
-
     ### compare the two csv files for regressions
     - regressions_found=0
-    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_MAIN $CSV_BRANCH || regressions_found=$?
+    - python3 scripts/basop_check_for_changes_in_testcases.py --show_improvements --xml_report $XML_REPORT_BRANCH $CSV_BRANCH $CSV_MAIN > regression_log.txt || regressions_found=$?
 
-    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi
-    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi
-    - if [ $regressions_found != 0 ] && [ "$SKIP_REGRESSION_CHECK" != "true" ]; then
+    - exit_code=0
+    - *print-results-banner
+    - if [ $zero_errors_branch != 1 ]; then
+    -   echo "Run errors encountered!"
+    -   exit_code=$EXIT_CODE_FAIL
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $ERRORS_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $ERRORS_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the changes*.csv files in the job artifacts."
+    - elif [ $regressions_found != 0 ] && [ "$SKIP_REGRESSION_CHECK" != "true" ]; then
+    -    cat regression_log.txt
     -    if [ $allow_regressions_flag == 0 ]; then
-    -        echo "Detected regression wrt to main, [allow regression] not set!"
+    -        echo "Detected regression wrt to $CI_MERGE_REQUEST_TARGET_BRANCH_NAME, [allow regression] not set!"
     -        exit_code=$EXIT_CODE_FAIL;
     -    else
-    -        echo "Detected regression wrt to main, [allow regression] set."
+    -        echo "Detected regression wrt to $CI_MERGE_REQUEST_TARGET_BRANCH_NAME, [allow regression] set."
     -        exit_code=$EXIT_CODE_NON_BE;
     -    fi
+    -   echo "Reproduce locally with:"
+    -   echo -e "1. Create references with target branch $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:\n\t- git checkout $(cat $FLOAT_REF_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- mv IVAS_cod IVAS_cod_ref\n\t- mv IVAS_dec IVAS_dec_ref\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --update_ref 1 --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH"
+    -   echo -e "2. Run test with source branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:\n\t- git checkout $(cat $CUT_COMMIT_FILE)\n\t- make clean\n\t- make -j\n\t- python3 -m pytest $(cat $FAILED_TESTCASES_LIST) --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH"
+    -   echo "The individual command lines can be found in the changes*.csv files in the job artifacts."
     - fi
 
     - exit $exit_code
@@ -624,6 +821,9 @@ stages:
       - $CSV_MAIN
       - $SUMMARY_HTML_ARTIFACT_NAME
       - $IMAGES_ARTIFACT_NAME
+      - $FLOAT_REF_COMMIT_FILE
+      - $CUT_COMMIT_FILE
+      - $MERGE_TARGET_COMMIT_FILE
       - changes_crashes.csv
       - changes_MLD.csv
       - changes_MAXIMUM_ABS_DIFF.csv
@@ -652,10 +852,17 @@ stages:
     - *update-scripts-repo
     - *copy-ltv-files-to-testv-dir
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
-    - *build-reference-and-dut-binaries
+
+    - *build-float-ref-binaries
+    - set -euxo pipefail
+    - make_args="CLANG=$CLANG_NUM"
+    - if [[ $CLANG_NUM == 3 ]]; then
+    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"
+    -   python3 scripts/basop_create_ignorelist_for_ubsan.py
+    -   make_args="$make_args IGNORELIST=1"
+    - fi
     - make clean
-    - make -j CLANG=$CLANG_NUM
-    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
+    - make -j $make_args
     - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS
     - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
   artifacts:
@@ -691,7 +898,7 @@ stages:
     - if [ $LEVEL_SCALING != "1.0" ];then
     -   *apply-testv-scaling
     - fi
-    - *build-reference-and-dut-binaries
+    - *build-float-ref-and-dut-binaries
 
     ### run pytest
     - exit_code=0
@@ -808,6 +1015,35 @@ fail-pipeline-if-in-draft:
 # verification jobs
 # ---------------------------------------------------------------
 
+branch-is-up-to-date-with-target-pre:
+  extends:
+    - .rules-merge-request
+  stage: prevalidate
+  needs: []
+  tags:
+    - ivas-basop-linux
+  script:
+    - *get-commits-behind-count
+    - |
+      if [ $commits_behind_count -ne 0 ]; then
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
+branch-is-up-to-date-with-target-post:
+  extends:
+    - .rules-merge-request
+  stage: postvalidate
+  tags:
+    - ivas-basop-linux
+  script:
+    - *get-commits-behind-count
+    - |
+      if [ $commits_behind_count -ne 0 ]; then
+        echo -e "Your branch is $commits_behind_count commits behind the target branch, possibly main changed during your pipeline run, run\n\tgit pull origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME\nto update."
+        exit 1
+      fi
+
 clang-format-check:
   extends:
     - .test-job-linux
@@ -986,71 +1222,157 @@ build-codec-linux-debugging-make:
 # Short test jobs that run in merge request pipelines
 # ---------------------------------------------------------------
 
-### jobs that test fx encoder -> flt decoder
-ivas-pytest-compare_to_main-short-enc:
+### jobs that check for bitexactness of fx encoder and decoder
+check-be-to-target-short-enc-0db:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_DECODER_PATH=./IVAS_dec_ref
+    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
     - LEVEL_SCALING=1.0
-    - SKIP_REGRESSION_CHECK="true"
-  <<: *ivas-pytest-on-merge-request-anchor
+    - rm -rf tests/dut tests/ref
+  <<: *check-be-to-target-anchor
 
-ivas-pytest-compare_to_main-short-enc-lev-10:
+check-be-to-target-short-enc-+10db:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_DECODER_PATH=./IVAS_dec_ref
+    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
-    - LEVEL_SCALING=0.3162
-    - SKIP_REGRESSION_CHECK="true"
-  <<: *ivas-pytest-on-merge-request-anchor
+    - LEVEL_SCALING=3.162
+    - rm -rf tests/dut tests/ref
+  <<: *check-be-to-target-anchor
 
-ivas-pytest-compare_to_main-short-enc-lev+10:
+check-be-to-target-short-enc--10db:
   extends:
-    - .rules-pytest-to-main-short
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_DECODER_PATH=./IVAS_dec_ref
+    - MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
-    - LEVEL_SCALING=3.162
-    - SKIP_REGRESSION_CHECK="true"
-  <<: *ivas-pytest-on-merge-request-anchor
+    - LEVEL_SCALING=0.3162
+    - rm -rf tests/dut tests/ref
+  <<: *check-be-to-target-anchor
 
-### jobs that test flt encoder -> fx decoder
-ivas-pytest-compare_to_main-short-dec:
+check-be-to-target-short-dec-0db:
   extends:
-    - .rules-mr-to-main-or-main-pc-or-manual
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_ENCODER_PATH=./IVAS_cod_ref
+    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
     - TEST_SUITE="$SHORT_TEST_SUITE"
     - LEVEL_SCALING=1.0
     - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
+  <<: *check-be-to-target-anchor
+
+check-be-to-target-short-dec-+10db:
+  extends:
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_ENCODER_PATH=./IVAS_cod_ref
+    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - LEVEL_SCALING=3.162
+    - rm -rf tests/dut tests/ref
+  <<: *check-be-to-target-anchor
 
-ivas-pytest-compare_to_main-short-dec-lev-10:
+check-be-to-target-short-dec--10db:
   extends:
-    - .rules-mr-to-main-or-main-pc-or-manual
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_ENCODER_PATH=./IVAS_cod_ref
+    - MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
     - TEST_SUITE="$SHORT_TEST_SUITE"
     - LEVEL_SCALING=0.3162
     - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
+  <<: *check-be-to-target-anchor
+
+### jobs that check for regressions on non-BE testcases
+check-regressions-short-enc-0db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-enc-0db"
+      artifacts: true
+  extends:
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_DECODER_PATH=./IVAS_dec_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
+    - LEVEL_SCALING=1.0
+    - rm -rf tests/dut tests/ref
+  <<: *check-regressions-pytest-anchor
 
-ivas-pytest-compare_to_main-short-dec-lev+10:
+check-regressions-short-enc-+10db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-enc-+10db"
+      artifacts: true
   extends:
-    - .rules-mr-to-main-or-main-pc-or-manual
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_DECODER_PATH=./IVAS_dec_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
+    - LEVEL_SCALING=3.162
+    - rm -rf tests/dut tests/ref
+  <<: *check-regressions-pytest-anchor
+
+check-regressions-short-enc--10db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-enc--10db"
+      artifacts: true
+  extends:
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_DECODER_PATH=./IVAS_dec_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
+    - LEVEL_SCALING=0.3162
+    - rm -rf tests/dut tests/ref
+  <<: *check-regressions-pytest-anchor
+
+check-regressions-short-dec-0db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-dec-0db"
+      artifacts: true
+  extends:
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_ENCODER_PATH=./IVAS_cod_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - LEVEL_SCALING=1.0
+    - rm -rf tests/dut tests/ref
+  <<: *check-regressions-pytest-anchor
+
+check-regressions-short-dec-+10db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-dec-+10db"
+      artifacts: true
+  extends:
+    - .rules-mr-to-main-or-main-pc
     - .test-job-linux
   before_script:
     - USE_LTV=0
@@ -1058,7 +1380,23 @@ ivas-pytest-compare_to_main-short-dec-lev+10:
     - TEST_SUITE="$SHORT_TEST_SUITE"
     - LEVEL_SCALING=3.162
     - rm -rf tests/dut tests/ref
-  <<: *ivas-pytest-on-merge-request-anchor
+  <<: *check-regressions-pytest-anchor
+
+check-regressions-short-dec--10db:
+  stage: test
+  needs:
+    - job: "check-be-to-target-short-dec--10db"
+      artifacts: true
+  extends:
+    - .rules-mr-to-main-or-main-pc
+    - .test-job-linux
+  before_script:
+    - USE_LTV=0
+    - DUT_ENCODER_PATH=./IVAS_cod_ref
+    - TEST_SUITE="$SHORT_TEST_SUITE"
+    - LEVEL_SCALING=0.3162
+    - rm -rf tests/dut tests/ref
+  <<: *check-regressions-pytest-anchor
 
 # ---------------------------------------------------------------
 # Short test jobs for running from web interface or schedule
@@ -1067,8 +1405,7 @@ ivas-pytest-compare_to_main-short-dec-lev+10:
 ### jobs that test fx encoder -> flt decoder
 ivas-pytest-compare_to_ref-short-enc:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-mr-to-main-or-main-pc-or-manual
+    - .rules-pytest-to-ref-short
     - .test-job-linux
   before_script:
     - USE_LTV=0
@@ -1080,9 +1417,8 @@ ivas-pytest-compare_to_ref-short-enc:
 
 ivas-pytest-compare_to_ref-short-enc-lev-10:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-mr-to-main-or-main-pc-or-manual
-    - .test-job-linux    
+    - .rules-pytest-to-ref-short
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - ENCODER_TEST="true"
@@ -1093,9 +1429,8 @@ ivas-pytest-compare_to_ref-short-enc-lev-10:
 
 ivas-pytest-compare_to_ref-short-enc-lev+10:
   extends:
-    #- .rules-pytest-to-ref-short
-    - .rules-mr-to-main-or-main-pc-or-manual
-    - .test-job-linux    
+    - .rules-pytest-to-ref-short
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - ENCODER_TEST="true"
@@ -1141,7 +1476,7 @@ ivas-pytest-enc-usan:
 ivas-pytest-compare_to_ref-short-dec:
   extends:
     - .rules-pytest-to-ref-short
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1152,7 +1487,7 @@ ivas-pytest-compare_to_ref-short-dec:
 ivas-pytest-compare_to_ref-short-dec-lev-10:
   extends:
     - .rules-pytest-to-ref-short
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1163,7 +1498,7 @@ ivas-pytest-compare_to_ref-short-dec-lev-10:
 ivas-pytest-compare_to_ref-short-dec-lev+10:
   extends:
     - .rules-pytest-to-ref-short
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=0
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1234,7 +1569,7 @@ ivas-pytest-dec-usan:
 ivas-pytest-compare_ref-long-enc:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1245,7 +1580,7 @@ ivas-pytest-compare_ref-long-enc:
 ivas-pytest-compare_ref-long-dec:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1256,7 +1591,7 @@ ivas-pytest-compare_ref-long-dec:
 ivas-pytest-compare_ref-long-enc-lev-10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1267,7 +1602,7 @@ ivas-pytest-compare_ref-long-enc-lev-10:
 ivas-pytest-compare_ref-long-dec-lev-10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1278,7 +1613,7 @@ ivas-pytest-compare_ref-long-dec-lev-10:
 ivas-pytest-compare_ref-long-enc-lev+10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1289,7 +1624,7 @@ ivas-pytest-compare_ref-long-enc-lev+10:
 ivas-pytest-compare_ref-long-dec-lev+10:
   extends:
     - .rules-pytest-long
-    - .test-job-linux    
+    - .test-job-linux
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1352,7 +1687,7 @@ coverage-test-on-main-scheduled:
     - *update-scripts-repo    
     - *update-ltv-repo
     - *copy-ltv-files-to-testv-dir
-    - *build-reference-binaries
+    - *build-float-ref-binaries
     # Build DuT binaries with GCOV
     - make clean
     - make GCOV=1 -j
@@ -1448,6 +1783,18 @@ ivas-pytest-renderer:
     - LEVEL_SCALING=1.0
   <<: *ivas-pytest-anchor
 
+peaq-enc-passthrough:
+  extends:
+    - .test-job-linux
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "peaq-enc-passthrough"
+  before_script:
+    - USE_LTV=0
+    - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE="tests/test_enc_passthrough.py"
+    - DELTA_ODG="true"
+    - LEVEL_SCALING=1.0
+  <<: *ivas-pytest-anchor
 
 # ---------------------------------------------------------------
 # Various other tests
@@ -1689,7 +2036,7 @@ ivas-pytest-on-merge-request:
     - *print-common-info
     - *update-scripts-repo
     - *update-ltv-repo
-    - *build-reference-and-dut-binaries
+    - *build-float-ref-and-dut-binaries
     - *complexity-measurements-setup
     - which coan
   artifacts:
diff --git a/.gitlab/issue_templates/float-update-porting.md b/.gitlab/issue_templates/float-update-porting.md
index 84d15a8c850ecb0ed5e6f92a0e0ba63f8fd057cf..19bbf7ba8c6def64e62370be7af899305207a50d 100644
--- a/.gitlab/issue_templates/float-update-porting.md
+++ b/.gitlab/issue_templates/float-update-porting.md
@@ -2,7 +2,5 @@
 
 <!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->
 - Original merge request in float repo:
-- Branch for float ref update:
-- Branch for BASOP update:
 
 /label ~Type:FloatUpdatePorting ~Status::ToDo
diff --git a/.gitlab/merge_request_templates/float-update-porting.md b/.gitlab/merge_request_templates/float-update-porting.md
index 7ffdee33307968e9991dffe88727976355a3d246..5b6d90dad72b5e2e145b118dd1fff2d5efb196f2 100644
--- a/.gitlab/merge_request_templates/float-update-porting.md
+++ b/.gitlab/merge_request_templates/float-update-porting.md
@@ -1,6 +1,6 @@
 
 - Link to issue in BASOP repo:
-- Link to original issue in float repo:
+- Link to original MR in float repo:
 - Requested reviewers:
 
 /label Type:FloatUpdatePorting
diff --git a/Makefile b/Makefile
index 4e92bc951388c8564bc2f2319e1a646aef1e01b1..9d18cbde3d47ff872b918dc70675543fc18cfba9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,15 @@ ifeq "$(CLANG)" "3"
 CC       = $(CCCLANG) 
 # NOTE: keep in sync with list in CMakeLists.txt
 usan_checks = undefined,float-divide-by-zero,implicit-conversion,local-bounds
-CFLAGS  += -fsanitize=$(usan_checks) 
+CFLAGS  += -fsanitize=$(usan_checks)
 CFLAGS  += -fsanitize-recover=$(usan_checks) 
 LDFLAGS += -fsanitize=$(usan_checks)
 LDFLAGS += -fsanitize-recover=$(usan_checks)
+
+ifeq "$(IGNORELIST)" "1"
+CFLAGS  += -fsanitize-ignorelist=ubsan_ignorelist.txt
+LDFLAGS += -fsanitize-ignorelist=ubsan_ignorelist.txt
+endif
 endif
 
 ifeq "$(RELEASE)" "1"
diff --git a/lib_com/cnst.h b/lib_com/cnst.h
index a5030ac9c98bb3bf1f430798afe117443c43918a..197fbd3c4a8d1fefce72a50844e2b639f7e82c7c 100644
--- a/lib_com/cnst.h
+++ b/lib_com/cnst.h
@@ -1536,6 +1536,7 @@ enum
 #define SHB_OVERLAP_LEN                     ( L_FRAME16k - L_SHB_LAHEAD ) / ( NUM_SHB_SUBFR - 1 )
 #define QUANT_DIST_INIT                     ( 10000000000.0f )      /* Quantiser search distance initialisation */
 #define HIBND_ACB_L_FAC                     5 / 2                   /* SHB Interpolation Factor */
+#define HIBND_ACB_L_FAC_Q1                  ( 5 )                   /* SHB Interpolation Factor Q1 */
 #define NUM_HILBERTS                        2
 #define HILBERT_ORDER1                      5
 #define HILBERT_ORDER2                      4
diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c
index ebd958e1bc048b3bf303847e41e45fac74076112..2704c1f085c84f92ea8c61236f4adeb1ec5af41c 100644
--- a/lib_com/ivas_dirac_com.c
+++ b/lib_com/ivas_dirac_com.c
@@ -967,6 +967,28 @@ void computeDiffuseness_fixed(
 
         q_tmp = add( q_factor_energy[i], min_q_shift1 );
 
+
+#ifdef FIX_1072_SPEEDUP_COMPUTEDIFUSENESS
+        Word16 shift_q = sub( q_tmp, q_ene );
+        Word32 shiftEquiv;
+        Word16 shift_qtotal;
+        if ( shift_q < 0 )
+        {
+            shiftEquiv = L_lshl( 0x80000000, shift_q );
+        }
+        if ( shift_q >= 0 )
+        {
+            shiftEquiv = L_add( 0x7FFFFFFF, 0 );
+        }
+        shift_qtotal = sub( min_q_shift1, s_max( shift_q, 0 ) );
+
+        FOR( k = 0; k < num_freq_bands; k++ )
+        {
+            tmp = L_shl( p_tmp_c[k], shift_qtotal );
+            energy_slow[k] = Madd_32_32_r( tmp, energy_slow[k], shiftEquiv );
+            move32();
+        }
+#else
         Word16 shift_q = sub( q_tmp, q_ene );
         IF( shift_q < 0 )
         {
@@ -986,6 +1008,8 @@ void computeDiffuseness_fixed(
                 move32();
             }
         }
+#endif
+
 
         q_ene = s_min( q_ene, q_tmp );
 
@@ -993,6 +1017,28 @@ void computeDiffuseness_fixed(
         q_tmp = add( q_factor_intensity[i], min_q_shift2 );
 
         shift_q = sub( q_tmp, q_intensity );
+#ifdef FIX_1072_SPEEDUP_COMPUTEDIFUSENESS
+        if ( shift_q < 0 )
+        {
+            shiftEquiv = L_lshl( 0x80000000, shift_q );
+        }
+        if ( shift_q >= 0 )
+        {
+            shiftEquiv = L_lshl( 0x7FFFFFFF, 0 );
+        }
+        shift_qtotal = sub( min_q_shift2, s_max( shift_q, 0 ) );
+
+        FOR( j = 0; j < DIRAC_NUM_DIMS; ++j )
+        {
+            p_tmp = buffer_intensity[j][i];
+            FOR( k = 0; k < num_freq_bands; k++ )
+            {
+                tmp = L_shl( p_tmp[k], shift_qtotal );
+                intensity_slow[j * num_freq_bands + k] = Madd_32_32_r( tmp, intensity_slow[j * num_freq_bands + k], shiftEquiv );
+                move32();
+            }
+        }
+#else
         IF( shift_q > 0 )
         {
             FOR( j = 0; j < DIRAC_NUM_DIMS; ++j )
@@ -1019,6 +1065,8 @@ void computeDiffuseness_fixed(
                 }
             }
         }
+#endif
+
         q_intensity = s_min( q_intensity, q_tmp );
     }
 
diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index 5ce037b9a2db1bf16bd7491fda0bc13cd25385e2..1682c255b7c47efbb622e03b2ca17a82571d3e46 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -3341,15 +3341,16 @@ void ivas_omasa_enc_fx(
 );
 
 void mctStereoIGF_enc_fx(
-    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure               */
-    Encoder_State **sts,                                 /* i/o: encoder state structure             */
-    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF               */
-    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum */
-    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/
-    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx and powSpecMsInv_fx*/
-    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */
-    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision               */
+    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure                      */
+    Encoder_State **sts,                                 /* i/o: encoder state structure                    */
+    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */
+    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */
+    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */
+    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */
+    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/
+    Word16 q_powerSpecMsInv[MCT_MAX_CHANNELS],           /* i  : Q for powSpecMsInv_fx                      */
+    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                           */
+    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision                      */
 );
 
 void ivas_mct_core_enc_fx(
diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100755
new mode 100644
index 0c8105d8cabb96dade519b47aa6e7405144bdb82..288145122a4dc6996dcc58c7974d23ea992fa457
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -156,6 +156,7 @@
 #define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/
 #define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */
 #define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/
+#define FIX_ISSUE_1291                          /* Ittiam: Wrong use of imult1616() in ACELP rescaling */
 #define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */
 #define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */
 #define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */
@@ -164,4 +165,11 @@
 #define FIX_ISSUE_1247
 #define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */
 #define FIX_1285_DECODER_CRASH
+#define FIX_1072_SPEEDUP_gainpanning            /* FhG: Minor WMOPS tuning, nonbe */
+#define FIX_1072_SPEEDUP_COMPUTEDIFUSENESS      /* FhG: Minor WMOPS tuning, nonbe */
+#define FIX_1320_LOWRATE_ACELP
+#define FIX_1297_OVERFLOW                       /* VA: fixes issue with overflows in pre-processing */
+#define FIX_1298                                /* VA: fix possible assert in gaus_enc */
+#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */
+#define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */
 #endif
diff --git a/lib_dec/acelp_core_dec_ivas_fx.c b/lib_dec/acelp_core_dec_ivas_fx.c
index e804b87555439d0f085e03aeb26f2f14a94bf4b0..712a3339f4ad0d1a8f0e3fcdc8ec8eadcfd2e302 100644
--- a/lib_dec/acelp_core_dec_ivas_fx.c
+++ b/lib_dec/acelp_core_dec_ivas_fx.c
@@ -748,7 +748,11 @@ ivas_error acelp_core_dec_ivas_fx(
             IF( st->hMusicPF && st->hGSCDec )
             {
                 Rescale_exc( st->hMusicPF->dct_post_old_exc_fx, exc_fx, bwe_exc_fx, st->hGSCDec->last_exc_dct_in_fx, st->L_frame,
+#ifdef FIX_ISSUE_1291
+                             L_FRAME32k, 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );
+#else
                              imult1616( st->L_frame, HIBND_ACB_L_FAC ), 0, &( st->Q_exc ), st->Q_subfr, NULL, 0, INACTIVE );
+#endif
             }
             IF( st->hPFstat != NULL )
             {
@@ -799,7 +803,7 @@ ivas_error acelp_core_dec_ivas_fx(
             Copy( syn1_fx + st->L_frame - L_SYN_MEM_CLAS_ESTIM, st->mem_syn_clas_estim_fx, L_SYN_MEM_CLAS_ESTIM );
 
             /* save and delay synthesis to be used by SWB BWE */
-            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn
+            Copy_Scale_sig( syn1_fx, temp_buf_fx, st->L_frame, sub( -1, st->Q_syn ) ); // Q_syn -> Q(-1)
             IF( st->hBWE_FD != NULL )
             {
 #ifdef FIX_ISSUE_1290
diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c
index 8d88074a835df6e35864fd37d80a0641b7551910..9aaddb2fb743d5160ff59ac9bfa251c15f4ba76d 100644
--- a/lib_dec/ivas_core_dec.c
+++ b/lib_dec/ivas_core_dec.c
@@ -782,6 +782,7 @@ ivas_error ivas_core_dec_fx(
         /* for inactive frames with mono output, copy and (if necessary) downmix buffers */
         ELSE IF( EQ_16( hCPE->nchan_out, 1 ) )
         {
+            Word16 shift1, shift2;
             sts[0] = hCPE->hCoreCoder[0];
             sts[1] = hCPE->hCoreCoder[1];
 
@@ -800,6 +801,15 @@ ivas_error ivas_core_dec_fx(
                 move16();
                 sts[1]->hHQ_core->Q_old_wtda = sub( 15, sts[1]->hHQ_core->exp_old_out );
                 move16();
+
+                shift1 = norm_arr( sts[0]->hHQ_core->old_out_fx, L_FRAME48k );
+                shift2 = norm_arr( sts[1]->hHQ_core->old_out_fx, L_FRAME48k );
+                scale_sig( sts[0]->hHQ_core->old_out_fx, L_FRAME48k, shift1 );
+                scale_sig( sts[1]->hHQ_core->old_out_fx, L_FRAME48k, shift2 );
+                sts[0]->hHQ_core->Q_old_wtda = add( sts[0]->hHQ_core->Q_old_wtda, shift1 );
+                sts[1]->hHQ_core->Q_old_wtda = add( sts[1]->hHQ_core->Q_old_wtda, shift2 );
+                move16();
+                move16();
             }
         }
 
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c
index 9514e5e2a13cf92647264eae718bfc698d9789ff..c7fce8dd599325e553d8ef88126acebee825f48d 100644
--- a/lib_dec/ivas_ism_param_dec.c
+++ b/lib_dec/ivas_ism_param_dec.c
@@ -176,26 +176,16 @@ static void ivas_param_ism_collect_slot_fx(
     Word32 *Cldfb_ImagBuffer_in_fx, /*Q(31-exp_imag)*/
     Word16 exp_imag,
     const Word16 ch,
-    Word32 ref_power_fx[], /*Q(31-exp_ref_power)*/
-    Word16 *exp_ref_power,
     Word32 cx_diag_fx[][PARAM_ISM_MAX_DMX], /*Q(31-exp_cx_diag)*/
-    Word16 *exp_cx_diag )
+    Word16 exp_cx_diag[][PARAM_ISM_MAX_DMX] )
 {
     Word16 band_idx, bin_idx;
     Word16 brange[2];
     Word32 tmp_fx;
     Word16 exp_tmp;
-    Word16 i, j;
 
     /* loop over parameter bands to collect transport channel energies */
 
-    Word16 exp_ref_power_buf[CLDFB_NO_CHANNELS_MAX];
-    Word16 exp_cx_diag_buf[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
-    set16_fx( exp_ref_power_buf, *exp_ref_power, CLDFB_NO_CHANNELS_MAX );
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        set16_fx( exp_cx_diag_buf[i], *exp_cx_diag, PARAM_ISM_MAX_DMX );
-    }
     FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
     {
         brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
@@ -213,53 +203,18 @@ static void ivas_param_ism_collect_slot_fx(
             tmp_fx = BASOP_Util_Add_Mant32Exp( tmp_fx, exp_tmp, var1, add( exp_real, exp_real ), &exp_tmp );
             tmp_fx = BASOP_Util_Add_Mant32Exp( tmp_fx, exp_tmp, var2, add( exp_imag, exp_imag ), &exp_tmp );
 
-            Word16 exp_cx_diag_new = 0, exp_ref_power_new = 0;
+            Word16 exp_cx_diag_new;
             move16();
             move16();
-            cx_diag_fx[bin_idx][ch] = BASOP_Util_Add_Mant32Exp( cx_diag_fx[bin_idx][ch], exp_cx_diag_buf[bin_idx][ch], tmp_fx, exp_tmp, &exp_cx_diag_new );
-            move32();
-            ref_power_fx[bin_idx] = BASOP_Util_Add_Mant32Exp( ref_power_fx[bin_idx], exp_ref_power_buf[bin_idx], tmp_fx, exp_tmp, &exp_ref_power_new );
+            cx_diag_fx[bin_idx][ch] = BASOP_Util_Add_Mant32Exp( cx_diag_fx[bin_idx][ch], exp_cx_diag[bin_idx][ch], tmp_fx, exp_tmp, &exp_cx_diag_new );
             move32();
-            exp_cx_diag_buf[bin_idx][ch] = exp_cx_diag_new;
-            move16();
-            exp_ref_power_buf[bin_idx] = exp_ref_power_new;
+            exp_cx_diag[bin_idx][ch] = exp_cx_diag_new;
             move16();
         }
     }
-
-    /*make common exponent*/
-    Word16 max_exp_cx_diag = exp_cx_diag_buf[0][0], max_exp_ref_power = exp_ref_power_buf[0];
-    move16();
-    move16();
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        FOR( j = 0; j < PARAM_ISM_MAX_DMX; j++ )
-        {
-            max_exp_cx_diag = s_max( max_exp_cx_diag, exp_cx_diag_buf[i][j] );
-        }
-        max_exp_ref_power = s_max( max_exp_ref_power, exp_ref_power_buf[i] );
-    }
-
-    FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
-    {
-        FOR( j = 0; j < PARAM_ISM_MAX_DMX; j++ )
-        {
-            cx_diag_fx[i][j] = L_shr_r( cx_diag_fx[i][j], sub( max_exp_cx_diag, exp_cx_diag_buf[i][j] ) ); // Q(31-max_exp_cx_diag)
-            move32();
-        }
-        ref_power_fx[i] = L_shr_r( ref_power_fx[i], sub( max_exp_ref_power, exp_ref_power_buf[i] ) ); // Q(31-max_exp_ref_power)
-        move16();
-    }
-
-    *exp_cx_diag = max_exp_cx_diag;
-    move16();
-    *exp_ref_power = max_exp_ref_power;
-    move16();
-
     return;
 }
 
-
 static void ivas_param_ism_compute_mixing_matrix_fx(
     const Word16 nchan_ism,                                         /* i  : number of ISM channels       */
     PARAM_ISM_DEC_HANDLE hParamIsmDec,                              /* i/o: decoder ParamISM handle */
@@ -268,9 +223,7 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
     const Word16 nchan_transport,
     const Word16 nchan_out_woLFE,
     Word32 cx_diag_fx[][PARAM_ISM_MAX_DMX], /*Q(31-cx_diag_e)*/
-    Word16 cx_diag_e,
-    Word32 ref_power_fx[], /*Q(31-ref_power_e)*/
-    Word16 ref_power_e,
+    Word16 cx_diag_e[][PARAM_ISM_MAX_DMX],
     Word32 mixing_matrix_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX], /*Q(31-mixing_matrix_e)*/
     Word16 mixing_matrix_e[CLDFB_NO_CHANNELS_MAX] )
 {
@@ -343,6 +296,27 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
 
             set32_fx( cy_diag_fx, 0, nchan_out_woLFE );
             set16_fx( cy_diag_e_arr, 0, nchan_out_woLFE );
+
+            /* equal cx diag exponents, compute ref power from cx_diag*/
+            Word16 max_exp_cx_diag;
+            Word32 cx_diag_eq_exp_fx[PARAM_ISM_MAX_DMX];
+            Word32 ref_power_fx;
+            Word16 ref_power_e, ref_power_e_new;
+            ref_power_fx = cx_diag_fx[bin_idx][0];
+            ref_power_e = cx_diag_e[bin_idx][0];
+
+            FOR( i = 1; i < PARAM_ISM_MAX_DMX; i++ )
+            {
+                ref_power_fx = BASOP_Util_Add_Mant32Exp( ref_power_fx, ref_power_e, cx_diag_fx[bin_idx][i], cx_diag_e[bin_idx][i], &ref_power_e_new );
+                ref_power_e = ref_power_e_new;
+            }
+            max_exp_cx_diag = ref_power_e;
+            FOR( i = 0; i < PARAM_ISM_MAX_DMX; i++ )
+            {
+                cx_diag_eq_exp_fx[i] = L_shr_r( cx_diag_fx[bin_idx][i], sub( max_exp_cx_diag, cx_diag_e[bin_idx][i] ) ); // Q(31-max_exp_cx_diag)
+            }
+
+
             FOR( w = 0; w < num_wave; w++ )
             {
                 test();
@@ -352,24 +326,25 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
                     SWITCH( nchan_ism )
                     {
                         case 2:
-                            direct_power_fx[w] = L_shr_r( ref_power_fx[bin_idx], 1 );
+                            direct_power_fx[w] = L_shr_r( ref_power_fx, 1 );
                             move32();
                             BREAK;
                         case 3:
-                            direct_power_fx[w] = Mpy_32_16_1( ref_power_fx[bin_idx], 10923 ); // 10923 = 1/3f in Q15
+                            direct_power_fx[w] = Mpy_32_16_1( ref_power_fx, 10923 ); // 10923 = 1/3f in Q15
                             move32();
                             BREAK;
                         case 4:
-                            direct_power_fx[w] = L_shr_r( ref_power_fx[bin_idx], 2 );
+                            direct_power_fx[w] = L_shr_r( ref_power_fx, 2 );
                             move32();
                             BREAK;
                     }
                 }
                 ELSE
                 {
-                    direct_power_fx[w] = Mpy_32_16_1( ref_power_fx[bin_idx], hParamIsmDec->power_ratios_fx[band_idx][0][w] ); // Q(31-ref_power_e)
+                    direct_power_fx[w] = Mpy_32_16_1( ref_power_fx, hParamIsmDec->power_ratios_fx[band_idx][0][w] ); // Q(31-ref_power_e[bin_idx])
                     move32();
                 }
+                // direct_power_e = ref_power_e[bin_idx];
                 direct_power_e = ref_power_e;
                 move16();
                 IF( direct_power_fx[w] != 0 )
@@ -410,7 +385,7 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
             }
 
             /* Compute mixing matrix */
-            computeMixingMatricesISM_fx( nchan_transport, num_wave, nchan_out_woLFE, response_matrix_fx, response_matrix_e, direct_power_fx, direct_power_e, cx_diag_fx[bin_idx], cx_diag_e, cy_diag_fx, cy_diag_e, proto_matrix_fx, 1,
+            computeMixingMatricesISM_fx( nchan_transport, num_wave, nchan_out_woLFE, response_matrix_fx, response_matrix_e, direct_power_fx, direct_power_e, cx_diag_eq_exp_fx, max_exp_cx_diag, cy_diag_fx, cy_diag_e, proto_matrix_fx, 1,
                                          PARAM_MC_REG_SX_FX, PARAM_MC_REG_GHAT_FX, mixing_matrix_fx[bin_idx], &mixing_matrix_e[bin_idx] );
         }
     }
@@ -1070,14 +1045,14 @@ void ivas_param_ism_dec_digest_tc_fx(
     Word32 *transport_channels[], /* i  : synthesized core-coder transport channels/DirAC output  q_tc_in*/
     Word16 q_tc_in )
 {
-    Word16 exp_ref_power = 31, exp_cx_diag = 31;
     Word16 exp_real_tmp = 0, exp_imag_tmp = 0;
     move16();
     move16();
     move16();
     move16();
-    Word32 ref_power_fx[CLDFB_NO_CHANNELS_MAX];
     Word32 cx_diag_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
+    Word16 exp_cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
+
     Word16 q_tc = q_tc_in;
     move16();
     Word16 ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
@@ -1132,15 +1107,8 @@ void ivas_param_ism_dec_digest_tc_fx(
     ivas_dirac_dec_set_md_map_fx( st_ivas, nCldfbSlots );
     /* set buffers to zero */
 
-    FOR( bin_idx = 0; bin_idx < CLDFB_NO_CHANNELS_MAX; bin_idx++ )
-    {
-        set_zero_fx( cx_diag_fx[bin_idx], PARAM_ISM_MAX_DMX );
-    }
-    exp_cx_diag = 0;
-    move16();
-    set_zero_fx( ref_power_fx, CLDFB_NO_CHANNELS_MAX );
-    exp_ref_power = 0;
-    move16();
+    set_zero_fx( &cx_diag_fx[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
+    set16_zero_fx( &exp_cx_diag[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
 
     /* Frame-level Processing */
     /* De-quantization */
@@ -1269,7 +1237,7 @@ void ivas_param_ism_dec_digest_tc_fx(
                                             &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx],
                                             exp_imag_tmp,
                                             ch,
-                                            ref_power_fx, &exp_ref_power, cx_diag_fx, &exp_cx_diag );
+                                            cx_diag_fx, exp_cx_diag );
 
             exp_real_tmp = add( exp_real_tmp, scale_factor_real );
             exp_imag_tmp = add( exp_imag_tmp, scale_factor_imag );
@@ -1284,7 +1252,7 @@ void ivas_param_ism_dec_digest_tc_fx(
     }
 
     /* Compute mixing matrix */
-    ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag, ref_power_fx, exp_ref_power,
+    ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag,
                                              hParamIsmDec->hParamIsmRendering->mixing_matrix_lin_fx, hParamIsmDec->hParamIsmRendering->exp_mixing_matrix_lin_fx );
 
     pop_wmops();
diff --git a/lib_enc/ACcontextMapping_enc_fx.c b/lib_enc/ACcontextMapping_enc_fx.c
index 08baa4f3d23dcbd61f5d030b675c9afdaed50180..203f39707841de02331ada3f1c518abda24cf86e 100644
--- a/lib_enc/ACcontextMapping_enc_fx.c
+++ b/lib_enc/ACcontextMapping_enc_fx.c
@@ -16,6 +16,9 @@
 #include "prot_fx_enc.h"
 #include "ivas_prot.h" /* Range coder header file */
 
+#define MAKE_NUMBER_QX( number, QX )     ( ( number ) << ( QX ) )                                      /* evaulated at compile time */
+#define MAKE_VARIABLE_QX( variable, QX ) W_shl( W_deposit32_l( L_deposit_l( ( variable ) ) ), ( QX ) ) /* evaluated at run time */
+
 /*-------------------------------------------------------------------*
  * ACcontextMapping_encode2_no_mem_s17_LC_fx()
  *
@@ -1106,8 +1109,8 @@ void RCcontextMapping_encode2_no_mem_s17_LCS_fx(
     }
 
     /* Finish range encoder */
-    rc_tot_bits = rc_uni_enc_finish_fx( &rc_st_enc ); /* No. of bits consumed by range coder	Q0*/
-    bp = add( rc_tot_bits, nbbits_ntuples );          /* Update bitstream pointer	Q0*/
+    rc_tot_bits = rc_uni_enc_finish_fx( &rc_st_enc ); /* No. of bits consumed by range coder    Q0*/
+    bp = add( rc_tot_bits, nbbits_ntuples );          /* Update bitstream pointer    Q0*/
 
     /* Cross-check that there is no overflow */
 
@@ -1215,11 +1218,11 @@ static Word16 find_last_nz_pair_fx(
  *-------------------------------------------------------------------*/
 
 Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
-    Word16 *x,                /* Spectral coefficients	Q0*/
-    const Word16 nt,          /* L - size of spectrum (no. of spectral coefficients)		Q0*/
+    Word16 *x,                /* Spectral coefficients    Q0*/
+    const Word16 nt,          /* L - size of spectrum (no. of spectral coefficients)        Q0*/
     Word16 *lastnz_out,       /* Q0 */
-    Word16 *nEncoded,         /* No. of spectral coefficients that can be coded without an overflow occuring		Q0*/
-    const Word16 target,      /* Target bits		Q0*/
+    Word16 *nEncoded,         /* No. of spectral coefficients that can be coded without an overflow occuring        Q0*/
+    const Word16 target,      /* Target bits        Q0*/
     Word16 *stop,             /* Q0 */
     Word16 mode,              /* Q0 */
     CONTEXT_HM_CONFIG *hm_cfg /* context-based harmonic model configuration */
@@ -1231,23 +1234,18 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
     UWord16 t;
     Word16 lastnz, lastnz2;
     Word16 rateFlag;
-    Word32 bit_estimate_fx;
-    Word16 bit_estimate_e;
+    Word64 bit_estimate_fx; /* Q23 */
+
     Word16 symbol;
     const UWord8 *lookup;
-    Word32 nbits2_fx; // Q23
-    Word16 nbits2_e;
+    Word64 nbits2_fx;
 
     /* Initialization */
-    bit_estimate_fx = 2 * ONE_IN_Q29;
-    bit_estimate_e = 2;
-    move32();
-    move16();
+    bit_estimate_fx = MAKE_NUMBER_QX( 2, Q23 );
+    move64();
 
     nbits2_fx = 0;
-    nbits2_e = 0;
-    move32();
-    move16();
+    move64();
 
     /* bits to encode lastnz */
     k = 1;
@@ -1255,15 +1253,13 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
     WHILE( LT_16( k, nt / 2 ) )
     {
-        bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ONE_IN_Q30, 1, &bit_estimate_e );
-        k = k << 1;
+        bit_estimate_fx = W_add( bit_estimate_fx, MAKE_NUMBER_QX( 1, Q23 ) );
+        k = shl( k, 1 );
         /* check while condition */
     }
 
-    nbits2_fx = bit_estimate_fx; /* exp(bit_estimate_e) */
-    nbits2_e = bit_estimate_e;
-    move32();
-    move16();
+    nbits2_fx = bit_estimate_fx;
+    move64();
 
     IF( hm_cfg )
     {
@@ -1350,9 +1346,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             b1 = (Word16) abs( x[b1_i] );
             lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
 
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( a1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( b1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
             /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
             lookup = &ari_lookup_s17_LC[t] + ( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) );
 
@@ -1362,9 +1357,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             {
                 pki = lookup[lev1]; /* ESC symbol */
 
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, 2 * ONE_IN_Q29, 2, &bit_estimate_e );                           /* Add 2 LSB bits corresponding to the bit-plane		exp(bit_estimate_e) */
-
+                bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+                bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( 2, Q23 ) );
                 a1 = shr( a1, 1 );
                 b1 = shr( b1, 1 );
 
@@ -1375,11 +1369,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
             pki = lookup[lev1];
 
-            symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                  /* Q0 */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            symbol = add( a1, i_mult( A_THRES, b1 ) ); /* Q0 */
+            bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
 
             /* Should we truncate? */
-            IF( GT_32( L_shr( bit_estimate_fx, sub( Q16, bit_estimate_e ) ), L_shl( target, Q15 ) ) )
+            IF( GT_32( W_extract_l( W_shr( bit_estimate_fx, Q8 ) ), L_shl( target, Q15 ) ) )
             {
                 stop2 = 1;
                 move16();
@@ -1393,9 +1387,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             {
                 lastnz2 = add( b1_i, 1 );
                 nbits2_fx = bit_estimate_fx;
-                move32();
-                nbits2_e = bit_estimate_e;
-                move16();
+                move64();
             }
 
             /* Update context for next 2-tuple */
@@ -1436,11 +1428,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         } /*end of the 2-tuples loop*/
 
-        total_output_bits = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+        total_output_bits = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
 
         IF( *stop )
         {
-            total_output_bits = round_fx( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ) ); /* Q0 */
+            total_output_bits = round_fx( W_extract_l( W_shr( nbits2_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         }
 
         IF( stop2 )
@@ -1451,7 +1443,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         *nEncoded = lastnz2; /* Q0 */
         move16();
-        *stop = stop2; /* If zero, it means no overflow occured during bit-estimation	Q0*/
+        *stop = stop2; /* If zero, it means no overflow occured during bit-estimation    Q0*/
         move16();
         *lastnz_out = lastnz; /* Q0 */
         move16();
@@ -1465,7 +1457,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
         hm_cfg->numPeakIndices = numPeakIndicesOrig; /* Q0 */
         move16();
 
-        return round_fx( L_add( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ), ONE_IN_Q14 ) ); /* Q0 */
+
+        return round_fx( L_add( W_extract_l( W_shr( nbits2_fx, Q7 ) ), ONE_IN_Q14 ) ); /* Q0 */
     }
     ELSE /* if (!hm_cfg) */
     {
@@ -1512,7 +1505,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
         lastnz = add( lastnz, 2 ); /* Q0 */
         IF( LT_16( lastnz, 2 ) )
         {
-            lastnz = 2; /* At least one tuple is coded	Q0*/
+            lastnz = 2; /* At least one tuple is coded    Q0*/
             move16();
         }
 
@@ -1531,8 +1524,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             move16();
             rateQ = add( rateFlag, extract_l( GT_16( k, shr( nt, 1 ) ) ) ); /* Q0 */
 
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( a1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, s_min( b1, 1 ) * ONE_IN_Q30, 1, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+            bit_estimate_fx = W_add( bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
 
             /* pre-compute address of ari_pk_s17_LC_ext[0][Val_esc] to avoid doing it multiple times inside the loop */
             lookup = &ari_lookup_s17_LC[t + shl( rateQ, NBITS_CONTEXT )]; /* Q0 */
@@ -1544,8 +1537,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
                 pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
                 move16();
 
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
-                bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, 2 * ONE_IN_Q29, 2, &bit_estimate_e );                           /* Add 2 LSB bits corresponding to the bit-plane  exp(bit_estimate_e) */
+                bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+                bit_estimate_fx = W_add( bit_estimate_fx, MAKE_NUMBER_QX( 2, Q23 ) );
 
                 a1 = shr( a1, 1 );
                 b1 = shr( b1, 1 );
@@ -1559,11 +1552,11 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
             pki = lookup[( esc_nb << ( NBITS_CONTEXT + NBITS_RATEQ ) )]; /* Q0 */
             move16();
 
-            symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                  /* Q0 */
-            bit_estimate_fx = BASOP_Util_Add_Mant32Exp( bit_estimate_fx, bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], 8, &bit_estimate_e ); /* exp(bit_estimate_e) */
+            symbol = add( a1, i_mult( A_THRES, b1 ) ); /* Q0 */
+            bit_estimate_fx = W_add( bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
 
             /* Should we truncate? */
-            IF( GT_32( L_shr( bit_estimate_fx, sub( Q16, bit_estimate_e ) ), L_shl( target, Q15 ) ) ) /* Overflow occured */
+            IF( GT_32( W_extract_l( W_shr( bit_estimate_fx, Q8 ) ), L_shl( target, Q15 ) ) )
             {
                 overflow_flag = 1;
                 move16();
@@ -1573,9 +1566,8 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
                 IF( abs_s( x[k] ) || abs_s( x[k + 1] ) ) /* No overflow & non-zero tuple */
                 {
                     nbits2_fx = bit_estimate_fx; /* exp(bit_estimate_e) */
-                    nbits2_e = bit_estimate_e;
-                    move32();
-                    move16();
+                    move64();
+
                     lastnz2 = add( k, 2 );
                 }
             }
@@ -1595,15 +1587,15 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
 
         } /*end of the 2-tuples loop*/
 
-        tot_bits2 = round_fx( L_shr( nbits2_fx, sub( Q15, nbits2_e ) ) );
-        IF( LT_16( lastnz2, lastnz ) ) /* Overflow occured because unable to code all tuples */
+        tot_bits2 = round_fx( W_extract_l( W_shr( nbits2_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
+        IF( LT_16( lastnz2, lastnz ) )                                 /* Overflow occured because unable to code all tuples */
         {
             overflow_flag = 1;
             move16();
         }
         IF( EQ_16( mode, -1 ) )
         {
-            tot_bits2 = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+            tot_bits2 = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         }
         IF( overflow_flag == 0 ) /* No overflow */
         {
@@ -1618,7 +1610,7 @@ Word16 RCcontextMapping_encode2_estimate_no_mem_s17_LCS_fx(
     }
     ELSE
     {
-        *stop = round_fx( L_shr( bit_estimate_fx, sub( Q15, bit_estimate_e ) ) ); /* Q0 */
+        *stop = round_fx( W_extract_l( W_shr( bit_estimate_fx, Q7 ) ) ); /* Q23 -> Q16 -> Q0 */
         move16();
     }
 }
@@ -1669,10 +1661,8 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
         move16();
     }
 
-    hContextMem->bit_estimate_fx = 2; /* Q0 */
-    move32();
-    hContextMem->bit_estimate_e = Q31;
-    move16();
+    hContextMem->bit_estimate_fx = MAKE_NUMBER_QX( 2, Q23 );
+    move64();
 
 
     /* Init */
@@ -1685,15 +1675,15 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
 
     WHILE( LT_16( k, hContextMem->nt_half ) )
     {
-        hContextMem->bit_estimate_fx = L_add( hContextMem->bit_estimate_fx, 1 ); /* exp(bit_estimate_e) */
-        move32();
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_NUMBER_QX( 1, Q23 ) );
+        move64();
 
         k = shl( k, 1 );
         /* check while condition */
     }
 
     /* bits to encode lastnz */
-    hContextMem->nbits_old = extract_l( hContextMem->bit_estimate_fx ); /* Q0 */
+    hContextMem->nbits_old = round_fx( W_extract_l( W_shr( hContextMem->bit_estimate_fx, Q7 ) ) ); /* Q0 */
     move16();
 
     hContextMem->ctx = 0;
@@ -1713,14 +1703,8 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_start_fx(
             BREAK;
         }
     }
-    Word16 tmp2 = extract_l( hContextMem->bit_estimate_fx );
-    Word16 tmp = norm_l( hContextMem->bit_estimate_fx );
-    hContextMem->bit_estimate_e = sub( Q31, tmp );
-    move16();
-    hContextMem->bit_estimate_fx = L_shl( hContextMem->bit_estimate_fx, tmp ); /* exp(bit_estimate_e) */
-    move32();
 
-    return tmp2;
+    return hContextMem->nbits_old;
 }
 
 /*-------------------------------------------------------------------*
@@ -1777,8 +1761,9 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
         lev1 = -( 1 << ( NBITS_CONTEXT + NBITS_RATEQ ) ); /* Q0 */
 
         /* Signs Bits */
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, imult3216( ONE_IN_Q30, s_min( a1, 1 ) ), Q1, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, imult3216( ONE_IN_Q30, s_min( b1, 1 ) ), Q1, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_VARIABLE_QX( s_min( a1, 1 ), Q23 ) );
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_VARIABLE_QX( s_min( b1, 1 ), Q23 ) );
+
         move32();
         move32();
 
@@ -1792,11 +1777,12 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
             pki = lookup[lev1]; /* Q0 */
             move16();
 
-            hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC], Q8, &hContextMem->bit_estimate_e ); /* exp(hContextMem->bit_estimate_e) */
-            hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, 2 * ONE_IN_Q29, Q2, &hContextMem->bit_estimate_e );                           /* Add the 2 LSB bits that were shifted out	exp(hContextMem->bit_estimate_e) */
+            hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][VAL_ESC] );
+            hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, MAKE_NUMBER_QX( 2, Q23 ) );
             move32();
             move32();
 
+
             // hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][VAL_ESC];
             // hContextMem->bit_estimate += 2; /* Add the 2 LSB bits that were shifted out */
 
@@ -1809,8 +1795,9 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
 
         pki = lookup[lev1]; /* Q0 */
         move16();
-        symbol = add( a1, i_mult( A_THRES, b1 ) );                                                                                                                                                       /* MSB symbol	Q0*/
-        hContextMem->bit_estimate_fx = BASOP_Util_Add_Mant32Exp( hContextMem->bit_estimate_fx, hContextMem->bit_estimate_e, ari_bit_estimate_s17_LC_fx[pki][symbol], Q8, &hContextMem->bit_estimate_e ); /* exp(bit_estimate_e) */
+        symbol = add( a1, i_mult( A_THRES, b1 ) ); /* MSB symbol    Q0*/
+        hContextMem->bit_estimate_fx = W_add( hContextMem->bit_estimate_fx, ari_bit_estimate_s17_LC_fx[pki][symbol] );
+
         move32();
         // hContextMem->bit_estimate = hContextMem->bit_estimate + ari_bit_estimate_s17_LC[pki][symbol];
 
@@ -1829,10 +1816,11 @@ Word16 RCcontextMapping_encode2_estimate_bandWise_fx(
         hContextMem->ctx = add( i_mult( s_and( hContextMem->ctx, 0xf ), 16 ), t ); /* Q0 */
         move16();
 
-    }                                                                                                               /*end of the 2-tuples loop*/
-    total_output_bits = round_fx( L_shr( hContextMem->bit_estimate_fx, sub( Q15, hContextMem->bit_estimate_e ) ) ); /* Q0 */
+    }                                                                                         /*end of the 2-tuples loop*/
+    total_output_bits = round_fx( W_extract_l( W_shr( hContextMem->bit_estimate_fx, Q7 ) ) ); /* Q0 */
     // total_output_bits = (Word16) ( hContextMem->bit_estimate + 0.5f );
 
+
     bandBits = sub( total_output_bits, hContextMem->nbits_old ); /* Q0 */
     hContextMem->nbits_old = total_output_bits;                  /* Q0 */
     move16();
diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c
index a9add7ea809f9c8fcd1541cb85f10011adc96ef1..a7d60642bb0d6c56b7772c47e85b77b2a6138b9f 100644
--- a/lib_enc/gaus_enc_fx.c
+++ b/lib_enc/gaus_enc_fx.c
@@ -980,9 +980,13 @@ void gauss2v_ivas_fx(
             /* eneri = round_fx(ener[i]) + round_fx(ener[j]) + 2*round_fx(dotprod) */
             /* Use ScalingShift to stay aligned with ener[] */
             eneri = L_shl( dotprod, 1 ); /* One left shift added for factor of 2 */
+#ifndef FIX_1298
             eneri = L_add( ener[i], eneri );
             eneri = L_add( ener[j], eneri ); /* Q31 */
-
+#else
+            eneri = L_add_sat( ener[i], eneri );
+            eneri = L_add_sat( ener[j], eneri ); /* Q31 */
+#endif
             lo1 = L_Extract_lc( cor32, &hi1 );
             cor2 = Sad_32( 0, hi1, lo1 ); /* Square + Add */
 
diff --git a/lib_enc/igf_enc.c b/lib_enc/igf_enc.c
index d20169e73002d69c8cb78e00026c3e61cae2eed9..0ce0875086554ce8a9276679ab6f413ed6554edf 100644
--- a/lib_enc/igf_enc.c
+++ b/lib_enc/igf_enc.c
@@ -943,9 +943,9 @@ static void IGF_CalculateEnvelope_ivas_fx(
                 move16();
                 sfbEnergyR = add_sat( EPSILON_FX, BASOP_Util_Divide3216_Scale( sum2_32_fx( pMDCTSpectrum_fx + swb_offset[sfb], width, &tmp_e ) /*exp: tmp_e*/, width, &sfbEnergyR_e ) ); // sfbEnergyR_e
                 sfbEnergyR_e = add( sfbEnergyR_e, add( tmp_e, -15 ) );
-                gain = sfbEnergyR; // gain_e
+                gain = L_shl( sfbEnergyR, 16 ); // gain_e
                 move32();
-                gain_e = add( sfbEnergyR_e, 16 );
+                gain_e = sfbEnergyR_e;
 
                 IF( element_mode > EVS_MONO )
                 {
diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c
index 1430607d63c1a7d7f103bf877c38327641aae61a..5e91a30fb2a04ab864d5a330b0fcd7c3a215ef67 100644
--- a/lib_enc/ivas_ism_param_enc.c
+++ b/lib_enc/ivas_ism_param_enc.c
@@ -307,7 +307,7 @@ void ivas_param_ism_stereo_dmx_fx(
             /* Smoothing */
             cardioid_left[i] = add( mult( 24576 /* 0.75f in Q15 */, cardioid_left[i] ), mult( 8192 /* 0.25f in Q15 */, last_cardioid_left ) ); // Q14
             move16();
-            grad = mult( sub( cardioid_left[i], last_cardioid_left ), shl( one_by_input_frame, 1 ) /* 2.0f / (float) input_frame*/ ); /* Q14 */ /* for the right cardioid, multiply with -1 */
+            Word32 grad_32 = L_mult( sub( cardioid_left[i], last_cardioid_left ), shl( one_by_input_frame, 1 ) /* 2.0f / (float) input_frame*/ ); /* Q14+Q16 = Q30 */ /* for the right cardioid, multiply with -1 */
             /* Cardioids sum up to 1 */
             cardioid_right[i] = sub( ONE_IN_Q14 /* 1.0f in Q14 */, cardioid_left[i] ); /* corresponds to: alpha + ( 1 - alpha ) * cosf( tmp + tmp_1 ); */
             move16();
@@ -316,13 +316,13 @@ void ivas_param_ism_stereo_dmx_fx(
             {
                 tmp = data[i][j];
                 move32();
-                tmp = W_extract_l( W_shr( W_mult_32_16( tmp, add( last_cardioid_left, mult0( j, grad ) ) ), 15 ) ); /* Qx DMX Left */
-                stereo_dmx[0][j] = L_add( stereo_dmx[0][j], tmp );                                                  /* Qx DMX Left */
+                tmp = W_extract_l( W_shr( W_mult_32_32( tmp, L_add( last_cardioid_left, L_shr( Mpy_32_32( L_shl( j, 22 ), grad_32 ), 7 ) ) ), 15 ) ); /* Qx DMX Left */
+                stereo_dmx[0][j] = L_add( stereo_dmx[0][j], tmp );                                                                                    /* Qx DMX Left */
                 move32();
                 tmp = data[i][j];
                 move32();
-                tmp = W_extract_l( W_shr( W_mult_32_16( tmp, add( last_cardioid_right, negate( mult0( j, grad ) ) ) ), 15 ) ); /* Qx DMX Right */
-                stereo_dmx[1][j] = L_add( stereo_dmx[1][j], tmp );                                                             /* Qx DMX Right */
+                tmp = W_extract_l( W_shr( W_mult_32_32( tmp, L_add( last_cardioid_right, L_shr( L_negate( Mpy_32_32( L_shl( j, 22 ), grad_32 ) ), 7 ) ) ), 15 ) ); /* Qx DMX Right */
+                stereo_dmx[1][j] = L_add( stereo_dmx[1][j], tmp );                                                                                                 /* Qx DMX Right */
                 move32();
                 ene_data = W_add( ene_data, W_mult_32_32( data[i][j], data[i][j] ) ); /* 2 * Qx + 1 energy of all objects combined */
             }
diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c
index e72270e6cb513fef5a0680588777c2ea79366a22..e219e8b37a1b1974f56e1432cc900c152fc57fd7 100644
--- a/lib_enc/ivas_lfe_enc.c
+++ b/lib_enc/ivas_lfe_enc.c
@@ -199,12 +199,13 @@ static void ivas_lfe_enc_quant_fx(
                 q_lfe_abs_sum = sub( q_lfe_abs_sum, q_tmp );
             }
 
-            tmp = BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp );
-            tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */
+            tmp = L_deposit_h( BASOP_Util_Divide3232_Scale( max_value, W_extract_l( lfe_abs_sum ), &q_tmp ) );
+            // tmp = L_shl( tmp, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) ); /* Q0 (max_value / lfe_abs_sum) */
+            q_tmp = sub( Q16, sub( q_lfe_abs_sum, sub( 15, q_tmp ) ) );
 
             /* log2_f(max_value / lfe_abs_sum) -> Q25 */
             tmp = BASOP_Util_Log2( tmp );
-            tmp = L_add( tmp, 1040187392 ) /* (31<<25) -> 1040187392 */; /* Q25 */
+            tmp = L_add( tmp, L_shl( sub( Q31, q_tmp ), Q25 ) ) /* (31<<25) -> 1040187392 */; /* Q25 */
 
             /* IVAS_LFE_SHIFTS_PER_DOUBLE * log2_f(max_value / lfe_abs_sum) */
             tmp = Mpy_32_16_1( tmp, IVAS_LFE_SHIFTS_PER_DOUBLE ); /* 25-15 -> Q10 */
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c
index f5f179778178b46b5b42d2037eecd9d79b3c7b87..52fd554d8397fb0e916eb1627f4f09d662593c49 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc.c
@@ -247,7 +247,7 @@ void ivas_mct_core_enc_fx(
     Word32 inv_spectrum_long_fx[MCT_MAX_CHANNELS][L_FRAME48k]; /* quantized MDCT spectrum, inv ms mask mdst spectrum, scratch for MS spectra in the MS decision */
     Word16 total_side_bits;
     Word16 chBitRatios[MCT_MAX_CHANNELS];
-    Word16 q_powSpec[MCT_MAX_CHANNELS], q_spec, q_origSpec, tmp_s;
+    Word16 q_powSpec[MCT_MAX_CHANNELS], q_powerSpecMsInv[MCT_MAX_CHANNELS], q_spec, q_origSpec, tmp_s;
     Word16 tmp_q_powSpec[L_FRAME48k], tmp_q_powSpecInv[L_FRAME48k], *tmp_q_psi[2];
     Word64 W_tmp;
     Encoder_State *sts[MCT_MAX_CHANNELS];
@@ -437,7 +437,7 @@ void ivas_mct_core_enc_fx(
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
                     W_tmp = W_mac_32_32( W_mult_32_32( mdst_spectrum_fx[ch][n][i], mdst_spectrum_fx[ch][n][i] ), sts[ch]->hTcxEnc->spectrum_fx[n][i], sts[ch]->hTcxEnc->spectrum_fx[n][i] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );
                     tmp_q_powSpec[( i + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -445,7 +445,7 @@ void ivas_mct_core_enc_fx(
                     move16();
 
                     W_tmp = W_mac_32_32( W_mult_32_32( inv_mdst_spectrum_fx[ch][n][i], inv_mdst_spectrum_fx[ch][n][i] ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );
                     tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -459,7 +459,7 @@ void ivas_mct_core_enc_fx(
                 {
                     /* power spectrum: MDCT^2 + MDST^2 */
                     W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][0], inv_spectrum_fx[ch][n][0] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][0] = W_extract_h( W_tmp );
                     tmp_q_psi[n][0] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -471,7 +471,7 @@ void ivas_mct_core_enc_fx(
                         mdst_fx = L_sub( inv_spectrum_fx[ch][n][i + 1], inv_spectrum_fx[ch][n][i - 1] ); /* An MDST estimate */
 
                         W_tmp = W_mac_32_32( W_mult_32_32( mdst_fx, mdst_fx ), inv_spectrum_fx[ch][n][i], inv_spectrum_fx[ch][n][i] );
-                        tmp_s = sub( W_norm( W_tmp ), 1 );
+                        tmp_s = W_norm( W_tmp );
                         W_tmp = W_shl( W_tmp, tmp_s );
                         powerSpecMsInv_fx[ch][n][i] = W_extract_h( W_tmp );
                         tmp_q_psi[n][i] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -480,7 +480,7 @@ void ivas_mct_core_enc_fx(
                     }
 
                     W_tmp = W_mult_32_32( inv_spectrum_fx[ch][n][L_subframeTCX - 1], inv_spectrum_fx[ch][n][L_subframeTCX - 1] );
-                    tmp_s = sub( W_norm( W_tmp ), 1 );
+                    tmp_s = W_norm( W_tmp );
                     W_tmp = W_shl( W_tmp, tmp_s );
                     powerSpecMsInv_fx[ch][n][L_subframeTCX - 1] = W_extract_h( W_tmp );
                     tmp_q_psi[n][L_subframeTCX - 1] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -490,7 +490,7 @@ void ivas_mct_core_enc_fx(
 
                 /* power spectrum: MDCT^2 + MDST^2 */
                 W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][0], sts[ch]->hTcxEnc->spectrum_fx[n][0] );
-                tmp_s = sub( W_norm( W_tmp ), 1 );
+                tmp_s = W_norm( W_tmp );
                 W_tmp = W_shl( W_tmp, tmp_s );
                 powerSpec_fx[ch][n * L_subframeTCX] = W_extract_h( W_tmp );
                 tmp_q_powSpec[n * L_subframeTCX] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -513,7 +513,7 @@ void ivas_mct_core_enc_fx(
                 }
 
                 W_tmp = W_mult_32_32( sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1], sts[ch]->hTcxEnc->spectrum_fx[n][L_subframeTCX - 1] );
-                tmp_s = sub( W_norm( W_tmp ), 1 );
+                tmp_s = W_norm( W_tmp );
                 W_tmp = W_shl( W_tmp, tmp_s );
                 powerSpec_fx[ch][( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = W_extract_h( W_tmp );
                 tmp_q_powSpec[( ( L_subframeTCX - 1 ) + ( n * L_subframeTCX ) )] = sub( add( imult1616( q_spec, 2 ), tmp_s ), 31 ); // Q = 2 * q_spec + 1 + tmp_s - 32
@@ -524,31 +524,31 @@ void ivas_mct_core_enc_fx(
 
         /* Aligning the Q-factors */
         {
+            q_powSpec[ch] = Q31;
+            move16();
+            q_powerSpecMsInv[ch] = Q31;
+            move16();
             /* NOTE: This logic has been added because using a constant headroom while computing `powSpec` and `powSpecMsInv` leads to significant precision loss, which results in poor quality. */
             FOR( i = 0; i < L_FRAME48k; i++ )
             {
-                if ( powerSpec_fx[ch][i] == 0 )
+                IF( powerSpec_fx[ch][i] != 0 )
                 {
-                    tmp_q_powSpec[i] = 63;
+                    q_powSpec[ch] = s_min( q_powSpec[ch], add( tmp_q_powSpec[i], norm_l( powerSpec_fx[ch][i] ) ) );
                     move16();
                 }
-                if ( powerSpecMsInv_fx[ch][0][i] == 0 )
+                IF( powerSpecMsInv_fx[ch][0][i] != 0 )
                 {
-                    tmp_q_powSpecInv[i] = 63;
+                    q_powerSpecMsInv[ch] = s_min( q_powerSpecMsInv[ch], add( tmp_q_powSpecInv[i], norm_l( powerSpecMsInv_fx[ch][0][i] ) ) );
                     move16();
                 }
             }
-            minimum_s( tmp_q_powSpec, L_FRAME48k, &q_powSpec[ch] );
-            minimum_s( tmp_q_powSpecInv, L_FRAME48k, &tmp_s );
-            q_powSpec[ch] = s_min( q_powSpec[ch], tmp_s );
-            move16();
 
             FOR( n = 0; n < nSubframes; n++ )
             {
                 FOR( i = 0; i < L_subframeTCX; i++ )
                 {
-                    powerSpecMsInv_fx[ch][n][i] = L_shr( powerSpecMsInv_fx[ch][n][i], sub( tmp_q_psi[n][i], q_powSpec[ch] ) );
-                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i], q_powSpec[ch] ) );
+                    powerSpecMsInv_fx[ch][n][i] = L_shr( powerSpecMsInv_fx[ch][n][i], sub( tmp_q_psi[n][i], q_powerSpecMsInv[ch] ) );
+                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i + ( n * L_subframeTCX )], q_powSpec[ch] ) );
                     move32();
                     move32();
                 }
@@ -606,7 +606,7 @@ void ivas_mct_core_enc_fx(
     {
         IF( hMCT->currBlockDataCnt > 0 )
         {
-            mctStereoIGF_enc_fx( hMCT, sts, orig_spectrum_fx, q_origSpec, powerSpec_fx, powerSpecMsInv_fx, q_powSpec, inv_spectrum_fx, sp_aud_decision0 );
+            mctStereoIGF_enc_fx( hMCT, sts, orig_spectrum_fx, q_origSpec, powerSpec_fx, q_powSpec, powerSpecMsInv_fx, q_powerSpecMsInv, inv_spectrum_fx, sp_aud_decision0 );
         }
         ELSE
         {
diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c
index 8c194bed19057993fb0cd12f0e8f4419bf8bc201..5510f1eb1b801c599eaa56893d690ea3b2bb525f 100644
--- a/lib_enc/ivas_mct_enc.c
+++ b/lib_enc/ivas_mct_enc.c
@@ -401,6 +401,8 @@ ivas_error ivas_mct_enc_fx(
             move16();
             st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_e[1] = sub( 31, q_spec );
             move16();
+            st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->hTcxEnc->spectrum_long_e = sub( 31, q_spec );
+            move16();
 
             IF( st_ivas->hCPE[cpe_id]->hCoreCoder[ch]->last_core == ACELP_CORE )
             {
diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c
index 4b84ea9cb607b05c7e6cd50ab7a198d9f8795b11..654c00db47d71332731b8986f75ed08fc5c70fa0 100644
--- a/lib_enc/ivas_mct_enc_mct.c
+++ b/lib_enc/ivas_mct_enc_mct.c
@@ -981,15 +981,16 @@ void write_mct_bitstream_fx(
  * IGF analysis of channels after MCT processing
  *--------------------------------------------------------------------*/
 void mctStereoIGF_enc_fx(
-    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure               */
-    Encoder_State **sts,                                 /* i/o: encoder state structure             */
-    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF               */
-    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum */
-    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate*/
-    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as above but for inverse spect.*/
-    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx and powSpecMsInv_fx*/
-    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                    */
-    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision               */
+    MCT_ENC_HANDLE hMCT,                                 /* i/o: MCT encoder structure                      */
+    Encoder_State **sts,                                 /* i/o: encoder state structure                    */
+    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */
+    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */
+    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */
+    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */
+    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/
+    Word16 q_powerSpecMsInv[MCT_MAX_CHANNELS],           /* i  : Q for powSpecMsInv_fx                      */
+    Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV],   /* i  : inverse spectrum                           */
+    const Word16 sp_aud_decision0[MCT_MAX_CHANNELS]      /* i  : speech audio decision                      */
 )
 {
     Word32 *p_powerSpecMsInv_fx[CPE_CHANNELS][NB_DIV];
@@ -999,6 +1000,7 @@ void mctStereoIGF_enc_fx(
 
     Word16 b, nSubframes, L_subframeTCX;
     Word16 p_ch[2], n, ch, ch1, ch2, s = 31;
+    Word16 q_pSI_ch[2];
     Word16 q_pS_ch[2];
     Encoder_State *p_st[NB_DIV];
     Encoder_State *st;
@@ -1062,7 +1064,9 @@ void mctStereoIGF_enc_fx(
             p_inv_spectrum_fx[0][n] = inv_spectrum_fx[ch1][n];
             p_inv_spectrum_fx[1][n] = inv_spectrum_fx[ch2][n];
             q_pS_ch[0] = q_powerSpec[ch1];
+            q_pSI_ch[0] = q_powerSpecMsInv[ch1];
             q_pS_ch[1] = q_powerSpec[ch2];
+            q_pSI_ch[1] = q_powerSpecMsInv[ch2];
             move16();
             move16();
 
@@ -1075,6 +1079,7 @@ void mctStereoIGF_enc_fx(
                 {
                     s = s_min( s, sub( 31, p_st[ch]->hTcxEnc->spectrum_e[n] ) );
                     s = s_min( s, q_pS_ch[ch] );
+                    s = s_min( s, q_pSI_ch[ch] );
                 }
                 FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
                 {
@@ -1085,7 +1090,7 @@ void mctStereoIGF_enc_fx(
                     move16();
                     move16();
 
-                    scale_sig32( p_powerSpecMsInv_fx[ch][0], L_FRAME48k, sub( s, q_pS_ch[ch] ) );
+                    scale_sig32( p_powerSpecMsInv_fx[ch][0], L_FRAME48k, sub( s, q_pSI_ch[ch] ) );
                     scale_sig32( &p_powerSpec_fx[ch][0], sts[ch]->hTcxEnc->L_frameTCX, sub( s, q_pS_ch[ch] ) );
                     q_powerSpec[ch1] = s;
                     q_powerSpec[ch2] = s;
diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c
index 18bee6777ee6ba6961bb2f7c5733b831cf25ee93..4997a6715df6023858860a4667962816a61dec14 100644
--- a/lib_enc/ivas_mdct_core_enc.c
+++ b/lib_enc/ivas_mdct_core_enc.c
@@ -2672,6 +2672,11 @@ void ivas_mdct_quant_coder_fx(
             st->hTcxEnc->spectrum_e[n] = min_shift;
             move16();
         }
+        if ( GT_16( nSubframes, 1 ) )
+        {
+            st->hTcxEnc->spectrum_long_e = min_shift;
+            move16();
+        }
     }
 
     EstimateStereoTCXNoiseLevel_fx( sts, quantized_spectrum_fx, gain_tcx_fx, gain_tcx_e, L_frame, noiseFillingBorder, hm_active, ignore_chan, fac_ns_fx, param_core, MCT_flag );
diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c
index c84fd73f1850eb4c4fd55af43f7a780acfb7f283..4913f2545a42a956b1e26f21ce074d32fd21aa7c 100644
--- a/lib_enc/ivas_stereo_classifier.c
+++ b/lib_enc/ivas_stereo_classifier.c
@@ -1647,7 +1647,11 @@ static void edge_detect_fx(
         }
     }
 
+#ifndef FIX_1297_OVERFLOW
     *edge_str = extract_l( L_shr( edge_min, 10 ) ); // Q15
+#else
+    *edge_str = extract_h( L_shl_sat( edge_min, 16 - 10 ) ); // Q15
+#endif
     move16();
     *edge_type = et; // Q0
     move16();
diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc.c
index 9d06a5523c8ce03a109f8aa85c19c67008243b3d..5b79f416a075dad4578e6832e72b814e6d46c630 100644
--- a/lib_enc/ivas_stereo_ica_enc.c
+++ b/lib_enc/ivas_stereo_ica_enc.c
@@ -1965,6 +1965,8 @@ void stereo_tca_enc_fx(
 
         Word16 temp_exp, tempF_16fx;
         Word16 scalar_value = BASOP_Util_Divide1616_Scale( currentNCShift, dsFactor, &temp_exp ); /* Q15-temp_exp */
+
+#ifndef FIX_1300_ICA_SHIFT_QUANT_IMPROV
         IF( temp_exp < 0 )
         {
             scalar_value = shl( scalar_value, sub( temp_exp, Q3 ) );                                                                   // Q12
@@ -1976,6 +1978,11 @@ void stereo_tca_enc_fx(
             hStereoTCA->indx_ica_NCShift = usquant_fx( scalar_value, &tempF_16fx, 0, shl( 1, sub( 14, temp_exp ) ), ( 1 << STEREO_BITS_TCA_CORRSTATS ) ); /* Q0 */
             move16();
         }
+#else
+        scalar_value = shl_sat( scalar_value, sub( temp_exp, 5 ) );                                                                              /*Q10*/
+        hStereoTCA->indx_ica_NCShift = usquant_fx( scalar_value, &tempF_16fx, 0, 512 /* 0.5 in Q10 */, ( 1 << STEREO_BITS_TCA_CORRSTATS ) );     /* Q0 */
+#endif
+
         tempF_fx = tempF_16fx;
         move32();
     }
diff --git a/lib_enc/ivas_stereo_td_analysis.c b/lib_enc/ivas_stereo_td_analysis.c
index 49ac895ef311482c64b080c6271dc01daa9abd8b..5bc62bc8b4520d162e5fb99be876e16a370b9246 100644
--- a/lib_enc/ivas_stereo_td_analysis.c
+++ b/lib_enc/ivas_stereo_td_analysis.c
@@ -74,9 +74,13 @@
 #define RATIO_MAX 1.5f /* Maximum correlation ratio */
 
 #define RATIO_MAX_FX_Q30 ( 1610612736 ) /* 1.5f in Q30 */ /* Maximum correlation ratio */
-#define RATIO_MAX_FX_Q24 ( 2516582 ) /* 1.5f in Q24 */    /* Maximum correlation ratio */
-#define RATIO_MAX_FX_Q23 ( 1258291 ) /* 1.5f in Q23 */    /* Maximum correlation ratio */
-
+#ifdef FIX_1301_CORRECT_TD_CNST
+#define RATIO_MAX_FX_Q24 ( 25165824 ) /* 1.5f in Q24 */ /* Maximum correlation ratio */
+#define RATIO_MAX_FX_Q23 ( 12582912 ) /* 1.5f in Q23 */ /* Maximum correlation ratio */
+#else
+#define RATIO_MAX_FX_Q24 ( 2516582 ) /* 1.5f in Q24 */ /* Maximum correlation ratio */
+#define RATIO_MAX_FX_Q23 ( 1258291 ) /* 1.5f in Q23 */ /* Maximum correlation ratio */
+#endif
 #define LIMIT_ADAP_FAC_FX_Q16 ( 9830 )    /* 0.15f in Q16 */
 #define MIN_ADAP_FAC_FX_Q16   ( 6554 )    /*0.1f in Q16*/
 #define M_ADAP_FX_Q31         ( 1932735 ) /* 0.0009f in Q31 */
@@ -258,7 +262,11 @@ Word16 stereo_tdm_ener_analysis_fx(
         rms_thd_fx = L_shr( rms_thd_fx, 2 ); /*Q16*/ /*rms_thd_fx *= 0.25f*/
         test();
         test();
+#ifdef FIX_1301_CORRECT_TD_CNST
+        IF( LE_32( hStereoTD->tdm_lt_rms_L_fx, 4915200 /* 75 in Q16*/ ) || LE_32( hStereoTD->tdm_lt_rms_R_fx, 4915200 /* 75 in Q16*/ ) /*|| sts[0]->last_coder_type == TRANSITION */ )
+#else
         IF( LE_32( hStereoTD->tdm_lt_rms_L_fx, 4915200 /* 75 in Q16*/ ) || LE_32( hStereoTD->tdm_lt_rms_R_fx, 75 /* 75 in Q16*/ ) /*|| sts[0]->last_coder_type == TRANSITION */ )
+#endif
         {
             rms_thd_fx = L_shr( rms_thd_fx, 5 ); /* Q16*/ /*rms_thd_fx *= 0.03125f*/
         }
@@ -332,6 +340,10 @@ Word16 stereo_tdm_ener_analysis_fx(
         move16();
     }
 
+#ifdef FIX_1301_CORRECT_TD_CNST
+    rms_L_fx = L_shl( rms_L_fx, sub( Q16, q_rms_L ) ); /* All the following energy comparison are done in Q16 */
+    rms_R_fx = L_shl( rms_R_fx, sub( Q16, q_rms_R ) );
+#endif
     test();
     IF( EQ_16( hStereoTD->prev_fr_LRTD_TD_dec, 1 ) && side_can_change == 0 )
     {
@@ -430,7 +442,11 @@ Word16 stereo_tdm_ener_analysis_fx(
         ELSE
         {
             /*ratio_L = ( 1.0f - cosf( EVS_PI * ratio_L / 2.0f ) ) / 2.0f;*/
+#ifdef FIX_1301_CORRECT_TD_CNST
+            ratio_L_fx = L_deposit_h( sub_sat( ONE_IN_Q14, getCosWord16( extract_l( Mpy_32_32( 1647099 /* EVS_PI/2 in Q20 */, ratio_L_fx ) ) ) ) ); // Q31 (Q14 + Q1(division by 2.0f) + Q16)
+#else
             ratio_L_fx = L_deposit_h( sub( ONE_IN_Q14, getCosWord16( extract_l( Mpy_32_32( 1647099 /* EVS_PI/2 in Q20 */, ratio_L_fx ) ) ) ) ); // Q31 (Q14 + Q1(division by 2.0f) + Q16)
+#endif
         }
 
         test();
@@ -478,7 +494,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         {
             test();
             test();
-            IF( GE_32( hCPE->element_brate, IVAS_48k ) && sts[0]->hVAD->hangover_cnt != 0 && LT_32( L_max( hStereoTD->tdm_lt_rms_L_fx, hStereoTD->tdm_lt_rms_R_fx ), 33554432 /* 512.0f */ ) )
+            IF( GE_32( hCPE->element_brate, IVAS_48k ) && sts[0]->hVAD->hangover_cnt != 0 && LT_32( L_max( hStereoTD->tdm_lt_rms_L_fx, hStereoTD->tdm_lt_rms_R_fx ), 33554432 /* 512.0f in Q16*/ ) )
             {
                 ratio_L_fx = check_bounds_l( ratio_L_fx, 644245094 /*0.3f in Q31*/, 1503238554 /*0.7f in Q31*/ ); /* Q31 */
             }
@@ -487,7 +503,7 @@ Word16 stereo_tdm_ener_analysis_fx(
             test();
             test();
             test();
-            IF( ( GT_32( hCPE->hStereoTCA->instTargetGain_fx, 644245094 /*1.2f in Q29*/ ) || GT_32( hCPE->hStereoTCA->targetGain_fx, ONE_IN_Q29 ) ) && LT_32( ratio_L_fx, 858993459 /*0.4f*/ ) )
+            IF( ( GT_32( hCPE->hStereoTCA->instTargetGain_fx, 644245094 /*1.2f in Q29*/ ) || GT_32( hCPE->hStereoTCA->targetGain_fx, ONE_IN_Q29 ) ) && LT_32( ratio_L_fx, 858993459 /*0.4f  in Q31*/ ) )
             {
                 ratio_L_fx = 858993459; /*0.4f in Q31*/
                 move32();
@@ -565,7 +581,7 @@ Word16 stereo_tdm_ener_analysis_fx(
         }
     }
 
-    IF( LT_16( sub( sts[1]->lp_speech_fx, sts[1]->lp_noise_fx ), 12800 /*50.0f*/ ) ) /* likely presence of noisy content */
+    IF( LT_16( sub( sts[1]->lp_speech_fx, sts[1]->lp_noise_fx ), 12800 /*50.0f in Q8*/ ) ) /* likely presence of noisy content */
     {
         /* pointing in the right direction, inverse it else do nothing */
         test();
@@ -639,7 +655,7 @@ Word16 stereo_tdm_ener_analysis_fx(
 #ifdef FIX_ISSUE_1125
     ratio_L_fx = tdm_ratio_tabl_fx_Q30[idx]; // Q30
 #else
-    ratio_L_fx = tdm_ratio_tabl_fx[idx];     // Q31
+    ratio_L_fx = tdm_ratio_tabl_fx[idx];                                                                                                        // Q31
 #endif
     move32();
 
@@ -650,7 +666,7 @@ Word16 stereo_tdm_ener_analysis_fx(
 #ifdef FIX_ISSUE_1125
         ratio_L_fx = tdm_ratio_tabl_fx_Q30[idx]; // Q30
 #else
-        ratio_L_fx = tdm_ratio_tabl_fx[idx]; // Q31
+        ratio_L_fx = tdm_ratio_tabl_fx[idx];                                                                                                    // Q31
 #endif
         move32();
     }
@@ -1059,7 +1075,11 @@ static void NOOP_decision_fx(
     }
     ELSE
     {
+#ifdef FIX_1301_CORRECT_TD_CNST
+        if ( LT_32( sts[0]->ee_old_fx, 320000 /* 5000.f in Q6 */ ) && LT_32( sts[1]->ee_old_fx, 320000 /* 5000.f in Q6 */ ) )
+#else
         if ( LT_32( sts[0]->ee_old_fx, 160000 /* 5000.f in Q6 */ ) && LT_32( sts[1]->ee_old_fx, 160000 /* 5000.f in Q6 */ ) )
+#endif
         {
             tdm_NOOP_switch_flag = 1;
             move16();
diff --git a/lib_enc/ivas_td_low_rate_enc.c b/lib_enc/ivas_td_low_rate_enc.c
index 95762fa296a63cfcc9d29666eae38654b62754fd..d091349514bccd4f2fbdd7eef7d6d9d8e9fa6441 100644
--- a/lib_enc/ivas_td_low_rate_enc.c
+++ b/lib_enc/ivas_td_low_rate_enc.c
@@ -222,6 +222,10 @@ void encod_gen_2sbfr(
 
     LPD_state_HANDLE hLPDmem = st->hLPDmem;
 
+#ifdef FIX_1320_LOWRATE_ACELP
+    Word16 gcode16;
+    Word32 Lgcode, Ltmp;
+#endif
 #ifdef MSAN_FIX
     set16_fx( cn, 0, 2 * L_SUBFR ); /* Target vector in residual domain  */
 #endif
@@ -269,8 +273,12 @@ void encod_gen_2sbfr(
         // Scale_sig( &hLPDmem->mem_w0, M + 1, sub( add( *Q_new, hLPDmem->e_mem_syn ), Q16 ) ); // M + 1 to sync mem_syn exponent with mem_w0 exponent
         // hLPDmem->e_mem_syn = sub( Q16, *Q_new );
 
-        find_targets_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq, res, 2 * L_SUBFR, p_Aw, st->preemph_fac, xn, cn, h1 );
 
+#ifndef FIX_1320_LOWRATE_ACELP
+        find_targets_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq, res, 2 * L_SUBFR, p_Aw, st->preemph_fac, xn, cn, h1 );
+#else
+        find_targets_ivas_fx( speech, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq, res, 2 * L_SUBFR, p_Aw, st->preemph_fac, xn, cn, h1 );
+#endif
         /*Scale_sig(h1, L_SUBFR, shift);  */ /*Q14-shift */
         Copy_Scale_sig( h1, h2, 2 * L_SUBFR, -2 );
         Scale_sig( h1, 2 * L_SUBFR, add( 1, shift ) ); /* set h1[] in Q14 with scaling for convolution */
@@ -294,14 +302,20 @@ void encod_gen_2sbfr(
          * Gain clipping test to avoid unstable synthesis on frame erasure
          *-----------------------------------------------------------------*/
 
+#ifndef FIX_1320_LOWRATE_ACELP
         clip_gain = gp_clip_fx( st->element_mode, st->core_brate, st->voicing_fx, i_subfr, coder_type, xn, st->clip_var_fx, Q_new ); // Q0
-
+#else
+        clip_gain = gp_clip_fx( st->element_mode, st->core_brate, st->voicing_fx, i_subfr, coder_type, xn, st->clip_var_fx, sub( Q_new, 1 ) ); // Q0
+#endif
         /*-----------------------------------------------------------------*
          * LP filtering of the adaptive excitation, codebook target computation
          *-----------------------------------------------------------------*/
 
+#ifndef FIX_1320_LOWRATE_ACELP
         lp_filt_exc_enc_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
-
+#else
+        lp_filt_exc_enc_ivas_fx( MODE1, coder_type, i_subfr, exc, h1, xn, y1, xn2, 2 * L_SUBFR, L_frame, g_corr, clip_gain, &gain_pit, &st->acelp_cfg.ltf_mode );
+#endif
         /* update long-term pitch gain for speech/music classifier */
         st->hSpMusClas->lowrate_pitchGain = add( mult( 29491, st->hSpMusClas->lowrate_pitchGain ), mult( 3277, gain_pit ) ); // Q14
         move16();
@@ -334,14 +348,30 @@ void encod_gen_2sbfr(
 
         gp_clip_test_gain_pit_fx( st->element_mode, st->core_brate, gain_pit, st->clip_var_fx );
 
+#ifndef FIX_1320_LOWRATE_ACELP
         hLPDmem->tilt_code = est_tilt_ivas_fx( exc + i_subfr, gain_pit, code, gain_code, &voice_fac, Q_new, 2 * L_SUBFR, 0 );
+#else
+        Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
+        gcode16 = round_fx_sat( Lgcode );       /*Q0*/
+        hLPDmem->tilt_code = est_tilt_ivas_fx( exc + i_subfr, gain_pit, code, Lgcode, &voice_fac, Q_new, 2 * L_SUBFR, 0 );
+#endif
         move16();
 
         /*-----------------------------------------------------------------*
          * Update memory of the weighting filter
          *-----------------------------------------------------------------*/
 
+#ifndef FIX_1320_LOWRATE_ACELP
         hLPDmem->mem_w0 = sub( sub( xn[2 * L_SUBFR - 1], mult_r( gain_pit, y1[2 * L_SUBFR - 1] ) ), mult_r( extract_h( gain_code ), y2[2 * L_SUBFR - 1] ) );
+#else
+        Ltmp = L_mult0( gcode16, y2[2 * L_SUBFR - 1] ); /*Q10*/
+        Ltmp = L_shl( Ltmp, add( 5, shift ) );          /*Q15+shift*/
+        Ltmp = L_negate( Ltmp );
+        Ltmp = L_mac( Ltmp, xn[2 * L_SUBFR - 1], 16384 /*Q14*/ );    /* Q_new-1+shift+14+1 */
+        Ltmp = L_msu( Ltmp, y1[2 * L_SUBFR - 1], gain_pit /*Q14*/ ); /* Q_new-1+shift+14+1 */
+        Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) );                   /* 15 + Q_new */
+        hLPDmem->mem_w0 = round_fx_sat( Ltmp );                      /*Q_new-1        */
+#endif
         move16();
 
         /*-----------------------------------------------------------------*
@@ -349,6 +379,7 @@ void encod_gen_2sbfr(
          * Save the non-enhanced excitation for FEC_exc
          *-----------------------------------------------------------------*/
 
+#ifndef FIX_1320_LOWRATE_ACELP
         FOR( i = 0; i < 2 * L_SUBFR; i++ )
         {
             exc2[i + i_subfr] = mult( gain_pit, exc[i + i_subfr] );
@@ -356,7 +387,20 @@ void encod_gen_2sbfr(
             exc[i + i_subfr] = add( exc2[i + i_subfr], mult( extract_h( gain_code ), code[i] ) );
             move16();
         }
-
+#else
+        FOR( i = 0; i < 2 * L_SUBFR; i++ )
+        {
+            /* code in Q9, gain_pit in Q14 */
+            exc2[i + i_subfr] = shl_sat( mult( gain_pit, exc[i + i_subfr] ), 1 );
+            Ltmp = L_mult( gcode16, code[i] );                    /* Q10 */
+            Ltmp = L_shl_sat( Ltmp, 5 );                          /* Q15 */
+            Ltmp = L_mac_sat( Ltmp, exc[i + i_subfr], gain_pit ); /* Q15 */
+            Ltmp = L_shl_sat( Ltmp, 1 );                          /* saturation can occur here Q16*/
+            exc[i + i_subfr] = round_fx_sat( Ltmp );
+            move16();
+            move16();
+        }
+#endif
         /*-----------------------------------------------------------------*
          * Prepare TBE excitation
          *-----------------------------------------------------------------*/
@@ -370,9 +414,11 @@ void encod_gen_2sbfr(
          * Synthesize speech to update mem_syn_flt[].
          * Update A(z) filters
          *-----------------------------------------------------------------*/
-
+#ifndef FIX_1320_LOWRATE_ACELP
         E_UTIL_synthesis( 0, p_Aq, &exc[i_subfr], &syn[i_subfr], 2 * L_SUBFR, hLPDmem->mem_syn, 1, M );
-
+#else
+        Syn_filt_s( 1, p_Aq, M, &exc[i_subfr], &syn[i_subfr], 2 * L_SUBFR, hLPDmem->mem_syn, 1 );
+#endif
         p_Aw += 2 * ( M + 1 );
         p_Aq += 2 * ( M + 1 );
 
diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c
index 32b521ef46060a8c68b6bdcc932f9220f458847f..295cff8a1a889597baf9340d513c08348b248002 100644
--- a/lib_enc/speech_music_classif_fx.c
+++ b/lib_enc/speech_music_classif_fx.c
@@ -2303,14 +2303,21 @@ Word16 ivas_smc_gmm_fx(
         *high_lpn_flag = 1;
         move32();
     }
-
+#ifndef FIX_1297_OVERFLOW
     hSpMusClas->lpm_fx = extract_l( L_shr( lpm_fx, 11 ) ); // Q7
     move16();
     hSpMusClas->lps_fx = extract_l( L_shr( lps_fx, 11 ) ); // Q7
     move16();
     hSpMusClas->lpn_fx = extract_l( L_shr( lpn_fx, 11 ) ); // Q7
     move16();
-
+#else
+    hSpMusClas->lpm_fx = extract_h( L_shl_sat( lpm_fx, 16 - 11 ) ); // Q7
+    move16();
+    hSpMusClas->lps_fx = extract_h( L_shl_sat( lps_fx, 16 - 11 ) ); // Q7
+    move16();
+    hSpMusClas->lpn_fx = extract_h( L_shl_sat( lpn_fx, 16 - 11 ) ); // Q7
+    move16();
+#endif
     /* determine HQ Generic speech class */
     IF( st->hHQ_core != NULL )
     {
diff --git a/lib_enc/stat_enc.h b/lib_enc/stat_enc.h
index 0f1c2e9069819986ab12526cc04c00dc626409c1..0fa9aeb88a40a1e6a6ebf0d620aaacab6abb59ae 100644
--- a/lib_enc/stat_enc.h
+++ b/lib_enc/stat_enc.h
@@ -2348,8 +2348,7 @@ typedef struct context_rc_mem_struct
 {
     int16_t nbits_old;
     int16_t ctx;
-    Word32 bit_estimate_fx;
-    Word16 bit_estimate_e;
+    Word64 bit_estimate_fx; /* Q23 */
     int16_t rateFlag;
     int16_t lastnz;
     int16_t nt_half;
diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c
index 1e35c78c4c590651080c7e4bb8877217efafdb25..27c8e6f5f2356a3e13762e5622e94e74c9a2a65c 100644
--- a/lib_enc/tcx_utils_enc_fx.c
+++ b/lib_enc/tcx_utils_enc_fx.c
@@ -3842,7 +3842,7 @@ void ProcessIGF_ivas_fx(
     ITF_Detect_ivas_fx( hIGFEnc->spec_be_igf, hIGFEnc->infoStartLine, hIGFEnc->infoStopLine, 8 /*maxOrder*/, A, &q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc->spec_be_igf_e ) );
 
     test();
-    IF( LT_32( L_deposit_l( hIGFEnc->tns_predictionGain ), 9646899 /* 1.15 in Q23 */ ) && LT_32( L_deposit_l( predictionGain ), 9646899 /* 1.15 in Q23 */ ) )
+    IF( LT_16( hIGFEnc->tns_predictionGain, ONE_POINT_ONE_FIVE_Q7 ) && LT_16( predictionGain, ONE_POINT_ONE_FIVE_Q7 ) )
     {
         hIGFEnc->flatteningTrigger = 1;
         move16();
@@ -3949,7 +3949,7 @@ void ProcessStereoIGF_fx(
         ITF_Detect_ivas_fx( hIGFEnc[ch]->spec_be_igf, hIGFEnc[ch]->infoStartLine, hIGFEnc[ch]->infoStopLine, 8 /*maxOrder*/, A, &Q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc[ch]->spec_be_igf_e ) );
 
         test();
-        hIGFEnc[ch]->flatteningTrigger = LT_32( hIGFEnc[ch]->tns_predictionGain, ONE_POINT_ONE_FIVE_Q23 ) && LT_32( predictionGain, ONE_POINT_ONE_FIVE_Q7 );
+        hIGFEnc[ch]->flatteningTrigger = LT_16( hIGFEnc[ch]->tns_predictionGain, ONE_POINT_ONE_FIVE_Q7 ) && LT_16( predictionGain, ONE_POINT_ONE_FIVE_Q7 );
         move16();
 
         hIGFEnc[ch]->infoTotalBitsPerFrameWritten = 0;
diff --git a/lib_rend/ivas_dirac_output_synthesis_dec.c b/lib_rend/ivas_dirac_output_synthesis_dec.c
index 4686ca1e6044dc75e51765c4827c15ee0b53abcd..866badda0ca163bc6a0b83542372d6e8b171f564 100644
--- a/lib_rend/ivas_dirac_output_synthesis_dec.c
+++ b/lib_rend/ivas_dirac_output_synthesis_dec.c
@@ -1081,6 +1081,16 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
             Word16 temp_q = sub( add( h_dirac_output_synthesis_state->direct_power_factor_q, h_dirac_output_synthesis_state->direct_responses_q ), 31 );
             IF( LT_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
             {
+#ifdef FIX_1072_SPEEDUP_gainpanning /*is there any difference in any bitstream?*/
+                Word16 temp_q1 = sub( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
+                FOR( Word16 kk = 0; kk < tmp16; kk++ )
+                {
+                    h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], temp_q1 ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ->temp_q*/
+                    move32();
+                }
+                h_dirac_output_synthesis_state->q_cy_cross_dir_smooth = temp_q;
+                move16();
+#else
                 FOR( Word16 kk = 0; kk < tmp16; kk++ )
                 {
                     h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], sub( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /*h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ->temp_q*/
@@ -1088,7 +1098,49 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                 }
                 h_dirac_output_synthesis_state->q_cy_cross_dir_smooth = temp_q;
                 move16();
+#endif
+            }
+#ifdef FIX_1072_SPEEDUP_gainpanning
+            Word16 temp_q1 = sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, temp_q );
+            FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )
+            {
+                IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )
+                {
+                    Word16 i;
+                    Word32 aux;
+                    IF( temp_q1 < 0 )
+                    {
+                        Word32 temp_q1_equiv = L_lshl( 0x80000000, temp_q1 );
+                        FOR( i = 0; i < num_freq_bands; i++ )
+                        {
+                            aux = Mpy_32_32( h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = Madd_32_32( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], aux, temp_q1_equiv );
+                            move32();
+                        }
+                    }
+                    ELSE
+                    {
+                        FOR( i = 0; i < num_freq_bands; i++ )
+                        {
+                            aux = Mpy_32_32( h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                            aux = L_shl( aux, temp_q1 );
+                            h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], aux );
+                            move32();
+                        }
+                    }
+                }
+                ELSE
+                {
+                    Word16 i;
+                    FOR( i = 0; i < num_freq_bands; i++ )
+                    {
+                        h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i] = Madd_32_32( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + i], h_dirac_output_synthesis_state->direct_power_factor_fx[i], h_dirac_output_synthesis_state->direct_responses_fx[ch_idx * num_freq_bands + i] );
+                        move32();
+                    }
+                }
             }
+
+#else
             FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_dir; ch_idx++ )
             {
                 v_mult_fixed( h_dirac_output_synthesis_state->direct_power_factor_fx,
@@ -1106,6 +1158,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
                              &h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands],
                              num_freq_bands, 0 ); /*Q(h_dirac_output_synthesis_state->q_cy_cross_dir_smooth)*/
             }
+#endif
 
             /*Diffuse gain*/
             FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ )