Merge "Add missing waiter to test_tagged_attachment"