[Maintenance] Align qa after release 3.17.0

Maintenance

Change log

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