Merge "Move several property queries to Properties class"