fixed config
Merge commit '1a8541b74674693dd54d5629c4fb7fda3294c21b' into HEAD