Merge branch 'macb-fixes'