[Core] Reapply [c2485] with correction for classic. Thank to @scotty0100 for pointing and helping. [z2513]