Merge "Fix USE_D8 in conjunction with USE_D8_BY_DEFAULT"