Default null values and api node is required.
Merge branch 'master' into fixes