Eluna Update Classic Branch for Sync with other Versions Thanks Rochet2

Signed-off-by: Salja <salja8840@gmail.com>