Contentviewers module merge fix