Cirrus to master (again)

Change-Id: Iccf29f2d5c8283448bb69e0b3d1f16d5c455012d