Merge "Use appropriate notify method instead"