fix merge errors
Master merged into logger.