[STAC-22384] upstream merge

[Andreagit97]

Step 1: Link to Jira issue

https://stackstate.atlassian.net/browse/STAC-22384

Step 2: Description of changes

Step 3: Did you add / update tests for your changes in the right area?

• Unit/Component test

Step 4: I'm confident that everything is properly tested:

I got a PO / QA Approval by:

• Name

Step 5: Can we ship this feature to production?

• Yes, I'm proud of my work. Ship it! 🚢

[Andreagit97]

For some comments on the code see the previous PR #184
I've opened this one with a branch name Andreagit97-stackstate-7.62.2 this should be compliant with docker tags