Merge in 2.8 config changes, update version