speed up for NullSafe expression
prepare 2.0.4-SNAPSHOT
minor changes