Merge "Upgrade rust/crates/async-trait to 0.1.40"