Add logging on unexpected userstamp error.
Merge branch 'master' into gsa