Cherrypick/delta m14 to m16

Type of change

• Bug Fix
• Feature

Does this introduce a change in the core logic?

• [No]

Does this introduce a change in the cloud provider implementation, if so which cloud?

• AWS
• Azure
• GCP
• IBM

Updates description?

Describe your code changes in details for reviewers (links on Gitlab issues, etc.)