Merge "C++17 compatibility: remove unreachable return."