Thanks to Alexander V. Chernikov for the original patch.
Adding some files that was accidentally removed (instead of moved) in cleanup part 2.