[FIX][T7560] Default location_ids changed and minor fixes

Merged Nicolas Russo requested to merge T7449 into master

Merge request reports