Merge rc1 into feature/economic-system-and-rewards with conflict resolution#26

Steake merged 2 commits intofeature/economic-system-and-rewardsSteake/BitCell:feature/economic-system-and-rewardsfrom

copilot/sub-pr-21-yet-againSteake/BitCell:copilot/sub-pr-21-yet-againCopy head branch name to clipboard