not-null
cleanup
not-null
cleanup
overrides
cleanup
fixed updater tests.
Merge remote-tracking branch 'origin/master'