[TIMOB-15833] Weak link MapKit
Merge pull request #5027 from jonalter/TIMOB-15833

[TIMOB-15833] Weak link MapKit