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

[TIMOB-15833] Weak link MapKit 3_2_X