[OOM-CPMv2] Fix sonar issue