[WIP] Fix issues related to stability improvements#21

Copilot wants to merge 1 commit intostability-improvementsyardexx/dart_shield:stability-improvementsfrom

copilot/sub-pr-20yardexx/dart_shield:copilot/sub-pr-20Copy head branch name to clipboard