Merge "FastPath: More clang-tidy optimizations"