Templates can't be null
Private methods
CS and doc
Event tests
Attr exceptions
Spaces
Merge remote-tracking branch 'origin/dev' into dev