Creating a pull request to prepare for final reviews before the big merge.

@karanpoddar No need to do anything about this, just using this to go through all of the changes again before we merge it back.
Strange but it appears to be correct when I view the file here on git or my end. If you check the 8x branch, it shows one space missing.