Cirrus to master (5e4b5f2)

Change-Id: I1eafa856a8f491e11d4a5a5fd684cb53a79297cb