Merge "init: expand arguments of services when they start"