update config
Merge commit '5ee45fbee79f2309b0604e77c981d8d7b7042133'