[Maintenance] Align qa after release 3.6.2

Maintenance

Change log

• Added: Commits from uat branch of the fix version 3.6.2 to qa branch.
• Changed:
• Deprecated:
• Removed:
• Fixed:
• Security:

Notes

Apparently in PR !1191 (merged) something was not done correctly, so the alignment had to be done again.