Sync with cpp-util repository