Bumped up the limit on the number of results returned from gen queries
from 500 to 50000.
Merge branch 'dev' into 1.8