Merge "Bug 3051: Fixed pattern checks in generated DTOs"