Merge "Ensure content shows before/after name" into sc-dev