LPS-37747 Use escaped model