Fixed padded variables to be padded 'NULL'(_)'s.
Authored by: dwarren 2017-11-13
Parent: [r9143]
Child: [r9145]
