update config
Merge commit '8be6ff89bcf8a0543b0376d98f24763415b7ac3d'