Merge branch 'bgmac'