Fix side effect of not triggering the commit for user data
Merge branch 'Issue_404'