* merge from dev: logging