Change duration wrapper to fieldset

Closes #3585611

Merge request reports

Loading