Merge branch 'extack-nonfatal'