Area search fixes: only the non-breaking bits
Merge commit '95c977b5fc4d2af9b78245c137bf1834513a9816'

* commit '95c977b5fc4d2af9b78245c137bf1834513a9816':
  Area search fixes: only the non-breaking bits
Merge branch 'master' into beta