Merge branch 'fujitsu' into release