Merge "[core] activated builder fragment for .config, .etmap"