Bump submodule to 172a99c718bded5faa169ac440517286684fa2f0 and fixup our code to support the latest version. Additionally, some water changes/fixes.