optimized log
merge master
merge master