Merge branch 'always_init_base'