Merge "FastPath: post clang-tidy cleanup"