release-19.4:Backport!3045

Merged Andrey Vertiprahov requested to merge cherry-pick-2aef4e32 into release-19.4

#1196 py3: Fix location handling

See merge request !3045 (merged)

(cherry picked from commit 2aef4e32)

0a6fdd23 #1196 py3: Fix location handling

Merge request reports