am e02247f4: Only signal collection swap on true swap

* commit 'e02247f4c53e1df4cac3a7b265ffb4307cca3650':
  Only signal collection swap on true swap