Draft: #3548261 Use --directory argument in all cases

Closes #3548261

Merge request reports

Loading