main merge conflicts 1.6.1 to ensure only dev is ahead of main#606

danuw merged 2 commits intodevGreen-Software-Foundation/carbon-aware-sdk:devfrom

feature/main-merge-conflicts-1.6.1Green-Software-Foundation/carbon-aware-sdk:feature/main-merge-conflicts-1.6.1Copy head branch name to clipboard