Another pulpv2 to content views merge