Template parameters and xml tags in description disappeared with upgrade to 5.1.5

Ok, this is very simple example:
Before upgrade description looks:
=================================
PROBLEM_DESCRIPTION:
Build: QAF-2.1.1-7343-qax (QAF 2.1.1. build #30)
Test environment: Windows 7 64-bit

If qacli view annotated source is executed on a header which itself includes a header file, annotated source is not generated for the included header file. Screenshot, project and logs attached.

METHOD_TO_REPRODUCE:
1. Open the attached project proj1
2. Clean then analyze the project:
qacli analyze -P . -fc
3. Generate the annotated source for test1.h
qacli view -P . -a -m HTML -- src/test1.h

ACTUAL RESULT:
The annotated source is produced only for test1.h

CLOSE_CRITERIA:
The annotated source is produced for test1.h and it's included file test2.h .

SAFETY_RELATED:
N/A
======================================
After upgrade it is looking this way:
======================================
PROBLEM_DESCRIPTION: Build: QAF-2.1.1-7343-qax (QAF 2.1.1. build #30) Test environment: Windows 7 64-bit If qacli view annotated source is executed on a header which itself includes a header file, annotated source is not generated for the included header file. Screenshot, project and logs attached. METHOD_TO_REPRODUCE: 1. Open the attached project proj1 2. Clean then analyze the project: qacli analyze -P . -fc 3. Generate the annotated source for test1.h qacli view -P . -a -m HTML -- src/test1.h ACTUAL RESULT: The annotated source is produced only for test1.h CLOSE_CRITERIA: The annotated source is produced for test1.h and it's included file test2.h . SAFETY_RELATED: N/A
================================================
Changing the editor to plain text:
===========================================
PROBLEM_DESCRIPTION: Build: QAF-2.1.1-7343-qax (QAF 2.1.1. build #30) Test environment: Windows 7 64-bit If qacli view annotated source is executed on a header which itself includes a header file, annotated source is not generated for the included header file. Screenshot, project and logs attached. METHOD_TO_REPRODUCE: 1. Open the attached project proj1 2. Clean then analyze the project: qacli analyze -P . -fc 3. Generate the annotated source for test1.h qacli view -P . -a -m HTML -- src/test1.h ACTUAL RESULT: The annotated source is produced only for test1.h CLOSE_CRITERIA: The annotated source is produced for test1.h and it's included file test2.h . SAFETY_RELATED: N/A
=============================================
Clean the cache:
=============================================
PROBLEM_DESCRIPTION: Build: QAF-2.1.1-7343-qax (QAF 2.1.1. build #30) Test environment: Windows 7 64-bit If qacli view annotated source is executed on a header which itself includes a header file, annotated source is not generated for the included header file. Screenshot, project and logs attached. METHOD_TO_REPRODUCE: 1. Open the attached project proj1 2. Clean then analyze the project: qacli analyze -P . -fc 3. Generate the annotated source for test1.h qacli view -P . -a -m HTML -- src/test1.h ACTUAL RESULT: The annotated source is produced only for test1.h CLOSE_CRITERIA: The annotated source is produced for test1.h and it's included file test2.h . SAFETY_RELATED: N/A
===========================================
As you can see changing editor has no effect

Hi,
Ticket #2496 marked as fixed but we still have the same behaviour in v.6.1.3.
As result we still cannot use the functionality we have paid for as we need to stay on the old version to prevent this problem.
Can you please fix this as soon as possible!