Merge branch 'common-data' into dt-test
Merge branch 'cirros-image' into dt-test