CON-2282 Combine padding to reduce number of properties