Merge branch 'sockeye' into master