Solving system env/content view timing issue
Merge pull request #2076 from daviddavis/temp_1366896708

Solving system env/content view timing issue