Merge branch 'fujitsu' into test