Squash Changes for headers and various board config changes