logging
merge 1.2.0