Merge "add scaling support to cirros"