Merge branch 'mg/reset-doc' into next