Merge "Remove LIMIT clause in query" into ub-launcher3-master