Merge "Adds source to Notification Condition" into main