Merge "BUG-544850: Allow to set limit on Query-API" into dev