Merge branch 'tc/merge-m-log' into maint