merge master
fix merge
better logs handling