This is a massive change. We are going to need at least a week to do any real review of the PR for this. Considering the release date is in 2 weeks, will this PR be ready in one week? If not we should push this to a 5.2.