Revert "Revert "This is a combination of 36 commits.""

This reverts commit 60371ca1828d83bdbda4451a422be871ec9605a8.