Fix command logic and forge version bump
Merge branch 'develop'