NOPConverter NullValue Hint
wip
Merge branch 'master' into nop-null
Merge branch 'nop-null'