Merge branch 'smc-fixes-for-smc-buffer-handling'