It's actually a simple cherry-pick, because I've been so annoying on keeping the history regarding file movements, now git can figure out how to backport things correctly Applying it.