Merge "Hush "must be marked explicit" clang-tidy warnings"