Update UNTIL formatting, add tests

Closes #3557685

Merge request reports

Loading