Merge pull request #9828 from berak:fix_c++17_9572