improvements for CMS Pages, caching, logging
Merge remote-tracking branch 'origin/master'