Checkpoint commit - diffing with G2 - verified basic functionality is OK
394.02 Alignment changes to config.c