Bring 16chan_adjustDataCarryover changes to 32chan_2board branch