Merge pull request #13335 from royalhuang/bug_13327_log_mq