Merge "init: support longer command lines"