set xml indent level to 2
add host bear
merge upstream