Merge "Don't trigger a sync for ALERTS tables" into klp-dev