Merge branch 'gc-fix-npe-during-delivery' into 'master'

Original MR: !432 (merged)

Type of change

• Bug Fix
• Feature

Please provide link to gitlab issue or ADR(Architecture Decision Record)

Does this introduce a change in the core logic?

• [YES/NO]

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

• AWS
• Azure
• Google Cloud
• IBM

Does this introduce a breaking change?

• [YES/NO]

What is the current behavior?

What is the new/expected behavior?

Have you added/updated Unit Tests and Integration Tests?

Any other useful information