am 48e1bd45: am 91afce93: am 9602d9ad: Fix issue #2325782 Missing location features

Merge commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49'

* commit '48e1bd45e2e4d1dda075aad26aea9ea16a597d49':
  Fix issue #2325782 Missing location features