Merge "chore(deps): bump cross-spawn" into integration