Merged PR #271 with the implementation of these constraints. Created HV-812, HV-813 and HV-814 as follow-ups to address some remaining issues.