Merge pull request #2380 from maryamtahhan/feat_mcelog_bugfixes