Merge "Use connection token in CommandEntry"