Bulk update to catch up with #98b3ba5