Model ema
key backward compatibility fix
#6972
Merged
ema
key backward compatibility fix
#6972