yr: Also search feature class S (spot, building, farm).
yr: Also search feature class S (spot, building, farm).

Former-commit-id: 0bd38e16d00ab14fdbcaf2b7745f699169ba565a [formerly d9bef0ccaecd47875d1523ea8dad6cc9fe22fa99]
Former-commit-id: 15c4867e492d1a7c276bc0604589acd6edd58f45
torhve/ivar2,haste/ivar2,torhve/ivar2,torhve/ivar2