make sure the session id is valid
Spacing.
Merge branch '4.2'