fixed #166
Merge branch 'bug/166-deadlock-in-headless-map-provider' into dev