Merge branch 'auto-init-addresses' into tmp