ENG-5571 passes regression testing, fails feature testing for FROM(SELECT...
more messy merge for analysis
Review comment cleanup.