Merge branch 'fadt-test' into test