update config
Merge commit '688ef78c60138c484aabf48fac9230b17ffea0e6'