remove NullMessage, see #3281
Merge branch 'wip-3281-NullMessage-∂π'