Merge "Removing status reporting from under lock."