LPS-41931 Handling global references in content