init.target: Updates from upstream