don't try to request length of non-collections
Merge remote-tracking branch 'plq/master' into development