LPS-41972 EntityResolver