Merge "Reduce cap for queue instance"