Merge "Fix reliability triggering"