Merge "Use unique_ptr for CommandEntry"