* only add a record to the store if it's not null
Merge remote-tracking branch 'origin/master'