Re #9003 - Updated default config based on testing in lab + various improvements
Re #8906 - Server and client refactor