Merge master into logger