Caching update from master branch.
Various fixes from master branch.
CSS updates from master branch.
Various cleanups from master branch.
Merge branch 'base'