Merge commit 'ms/minicom'