FORGE-1671: Introduced TypeHolder and TypeHolderSource