Detect a case that is easy to adapt from a reset into proper change update information
Merge remote-tracking branch 'origin/pr/681'