Merge "reduce number of location query" into 24D1-dev