ClientLibs Optimizer - Merge from kwon