update dev branch from x230
merge conf