Cirrus to master (again)

Change-Id: I537a506b217ec180ba640678c0adbf0206ee2b30