Merge "init: fix variable scope issue with ExpandArgs()"