Merge branch 'master' into feat_mcelog_notification_bugfixes