Merge "Limit the number of key descriptors sent back"