We need to include changes from - https://github.com/mapswipe/python-mapswipe-workers/pull/1052
We need to include changes from