Update for whirr-cm-2.2