Fix null handling
Add some test data
Sonar cleanup
Merge remote-tracking branch 'origin/master' into dev-nmalik