[Base] Sync with upstream#6

islobozhan merged 2 commits intomainelliot-project/elliot-cli:mainfrom

sync-upstreamelliot-project/elliot-cli:sync-upstreamCopy head branch name to clipboard