Merge branch 'upstream', fai 5.4