Merge branch 'havana' into dt-test