Merge branch 'tools' into dt-test
Merge branch 'nova-clean' into dt-test