Adding Contact safeguards
Merge branch 'lextech' into scottmsims

* lextech:
  Adding Contact safeguards