BS-10929, add validation on contract constraints