Hotfix/rebase3p0

[serkannpolatt]

Description

• [ ] Summary of the change / bug fix.
• [ ] Link # issue, if applicable.
• [ ] Screenshot of the feature or the bug before/after fix, if applicable.
• [ ] Relevant motivation and context.
• [ ] List any dependencies that are required for this change.

How has this been tested?

• Please describe the tests that you ran to verify your changes.
• Provide instructions so we can reproduce.
• Please also list any relevant details for your test configuration.

• [ ] Make sure affected commands still run in terminal
• [ ] Ensure the SDK still works
• [ ] Check any related reports

Checklist:

• [ ] I have adhered to the GitFlow naming convention and my branch name is in the format of feature/feature-name or hotfix/hotfix-name.
• [ ] Update our documentation following these guidelines. Update any user guides that are affected by the changes.
• [ ] Update our tests following these guidelines.
• [ ] Make sure you are following our CONTRIBUTING guidelines.
• [ ] If a feature was added make sure to add it to the corresponding integration test script.

Others

• [x] I have performed a self-review of my code.
• [ ] I have commented my code, particularly in areas that are difficult to understand.