Fix ASO and add missed views.
Merge pull request #4003 from HassenRiahi/FixAsoConfigAndMissedViews

Fix ASO config and add missed views.