Merge branch 'javelin-swift' into dt-test