update config
Merge commit '531168a34b3686727119102f131865b9b6acff70'