Resolving many unstable changes. Patches are NOT mine, credits to related contributors