Merge branch 'panasonic' into test