HV-843 Make members of non-public constraint types accessible

Take care, I used a wrong branch name!