hotfix: resolve merge conflicts between main and sachin/new-contracts-commands#1479
Merged
EverlastingBugstopper merged 2 commits intosachin/new-contracts-commandsfrom avery/fix-conflictsJan 19, 2023
main and sachin/new-contracts-commands#1479
