Merge branch 'bjorn-initcall-cleanup' into release