Fix/add loc args

Merged Simon Morlat requested to merge fix/add-loc-args into release/2.0

Merge request reports