Keep BC
Merge branch 'patch-4' into cleanup

* patch-4:
  Keep BC