Merge branch 'master' into module_log_level