Patch 0.9.17.0