Cherry picked 'notify only if changed' commit