Cirrus to master (1e652e7d)

Change-Id: I1723a8125dde4f8b8aaa4a56693be900ca84efe6