Merge changes from topic "jan15"

* changes:
  Dispatch notifyChange() after ending transaction.
  More consistent handling of filtering.
  Another pass at increasing test coverage.