We need to find time to move this out of the D/M, or at least out of the Entities section. But it won't stop the PR.