Content view register (after rebase)

Tests are failing otherwise.