[3.0.31] Merge changes (lucize) and adapt to existing mods