Fix a bug in deflections
Merge remote-tracking branch 'upstream/AT_subscribe' into AT_subscribe