Merge "Deprecate notification fields"