Manual cherry pick of cfbd64a05ad24d69cb977611a5be72656c1caecc Force Map refresh