Merge pull request #1103 from andrerod/dev

Lock validator module version down
Fix null reference
Merge remote-tracking branch 'upstream/dev' into dev