Merge "Increase the duration allowed for a TC result." into oc-mr1-dev