[MOD] Taking into account default zone & account

Merged Santiago Said requested to merge ConsiderDefaultZoneAccount into 8.0-stage

Merge request reports