Merge branch 'ep/shell-command-substitution-style'