Merge branch 'micro' into minor * micro: shell-no-trail-bslash: improve diagnostic in case of failure