committing null implementation
Merge branch 'NullRecord' into proj-2