Some hot-fixes that were merged to IX-9.17.0.