Merge pull request #1374 from tonytamps:feature/immutable-validation