am b1869d56: Merge "Only allocate collectors if we may use them"

* commit 'b1869d56444215f91f27ae037479ce65aca4e2a5':
  Only allocate collectors if we may use them