Merge branch 'fbdev/stable-updates'