Fork content views merge

Updating content_views off of master to pull in latest changes that were made to support newer runcible.