fix code and doc after merge with dev