Changed padded fields to 'NULL'(_), as MK suggested.
Authored by: dwarren 2017-11-12
Parent: [r9140]
Child: [r9142]
