Task OC-4073 is complete