ct_tracker: Do not call invalidate_cache if the base model does not have it
Merge branch 'master' into next

* master:
  ct_tracker: Do not call invalidate_cache if the base model does not have it
Merge remote-tracking branch 'upstream/next' into next
Merge branch 'next' into tabbed_options