Merge "Workaround for USE_D8 not in --dumpvars-mode"