Merge remote-tracking branch 'refs/remotes/origin/feat/add-terminate-contract' into feat/add-terminate-contract