Merge branch 'master' into 12bit