Fix #4637 Field Alignment

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>