Merge branch 'nova-fixes' into dt-test