Bug fix: NULL as default value
Merge remote-tracking branch 'origin/dev-v3' into master-v3