Merge branch 'ef/alias-via-run-command' into next