master

std-log-review-1