The PR for this issue only works when using Session/EntityManager.find. The same issue affects queries.